Changed the function name to conflict of symbol link

Change-Id: If4ee0e2b7ff960dd7b142b58fe2da14e1ea3005b

diff --git a/packaging/capi-mediademuxer.spec b/packaging/capi-mediademuxer.spec
index d1a54db..d09180c 100755 (executable)
--- a/packaging/capi-mediademuxer.spec
+++ b/packaging/capi-mediademuxer.spec
@@ -1,6 +1,6 @@
 Name:       capi-mediademuxer
 Summary:    A Media Demuxer library in Tizen Native API
-Version:    0.1.5
+Version:    0.1.6
 Release:    1
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/mediademuxer_port.c b/src/mediademuxer_port.c
index 409d94b..7abee84 100755 (executable)
--- a/src/mediademuxer_port.c
+++ b/src/mediademuxer_port.c
@@ -36,9 +36,9 @@
 #define MAX_ERR_LEN 256
 
 /* function type */
-extern int gst_port_register(media_port_demuxer_ops *pOps);
-extern int ffmpeg_port_register(media_port_demuxer_ops *pOps);
-extern int custom_port_register(media_port_demuxer_ops *pOps);
+extern int gst_mediademxer_port_register(media_port_demuxer_ops *pOps);
+extern int ffmpeg_mediademxer_port_register(media_port_demuxer_ops *pOps);
+extern int custom_mediademxer_port_register(media_port_demuxer_ops *pOps);
 int __md_util_exist_file_path(const char *file_path);
 bool __md_util_is_sdp_file(const char *path);
 mediademuxer_src_type __md_util_media_type(char **uri);
@@ -48,11 +48,11 @@ int _md_util_parse(MMHandleType demuxer, const char *type);
   * Sequence of functions should be same as the port enumeration
   * "port_mode" in mm_demuxer_ini.h file
   */
-typedef int (*register_port)(media_port_demuxer_ops *);
-register_port register_port_func[] = {
-       &gst_port_register,
-       &ffmpeg_port_register,
-       &custom_port_register
+typedef int (*register_port_demuxer)(media_port_demuxer_ops *);
+register_port_demuxer register_port_demuxer_func[] = {
+       &gst_mediademxer_port_register,
+       &ffmpeg_mediademxer_port_register,
+       &custom_mediademxer_port_register
 };
 
 int md_create(MMHandleType *demuxer)
@@ -82,7 +82,7 @@ int md_create(MMHandleType *demuxer)
        MEDIADEMUXER_CHECK_SET_AND_PRINT(result, MD_ERROR_NONE, result,
                                                                        MD_COURRPTED_INI, "can't load ini");
 
-       register_port_func[new_demuxer->ini.port_type](pOps);
+       register_port_demuxer_func[new_demuxer->ini.port_type](pOps);
        result = pOps->init(&new_demuxer->mdport_handle);
        MEDIADEMUXER_CHECK_SET_AND_PRINT(result, MD_ERROR_NONE, result,
                                                                        MD_NOT_INITIALIZED, "md_create failed");

diff --git a/src/port_custom/mediademuxer_port_custom.c b/src/port_custom/mediademuxer_port_custom.c
index 171d70c..78a6a7b 100755 (executable)
--- a/src/port_custom/mediademuxer_port_custom.c
+++ b/src/port_custom/mediademuxer_port_custom.c
@@ -43,7 +43,7 @@ static media_port_demuxer_ops def_demux_ops = {
        .get_data = custom_demuxer_get_data,
 };
 
-int custom_port_register(media_port_demuxer_ops *pOps)
+int custom_mediademxer_port_register(media_port_demuxer_ops *pOps)
 {
        int ret = MD_ERROR_NONE;
        MEDIADEMUXER_FENTER();

diff --git a/src/port_ffmpeg/mediademuxer_port_ffmpeg.c b/src/port_ffmpeg/mediademuxer_port_ffmpeg.c
index 352c385..4405359 100755 (executable)
--- a/src/port_ffmpeg/mediademuxer_port_ffmpeg.c
+++ b/src/port_ffmpeg/mediademuxer_port_ffmpeg.c
@@ -43,7 +43,7 @@ static media_port_demuxer_ops def_demux_ops = {
        .get_data = ffmpeg_demuxer_get_data,
 };
 
-int ffmpeg_port_register(media_port_demuxer_ops *pOps)
+int ffmpeg_mediademxer_port_register(media_port_demuxer_ops *pOps)
 {
        int ret = MD_ERROR_NONE;
        MEDIADEMUXER_FENTER();

diff --git a/src/port_gst/mediademuxer_port_gst.c b/src/port_gst/mediademuxer_port_gst.c
index 2214f2d..9205e35 100755 (executable)
--- a/src/port_gst/mediademuxer_port_gst.c
+++ b/src/port_gst/mediademuxer_port_gst.c
@@ -66,7 +66,7 @@ static media_port_demuxer_ops def_demux_ops = {
        .set_eos_cb = gst_set_eos_cb,
 };
 
-int gst_port_register(media_port_demuxer_ops *pOps)
+int gst_mediademxer_port_register(media_port_demuxer_ops *pOps)
 {
        MEDIADEMUXER_FENTER();
        int ret = MD_ERROR_NONE;