Changed the function name to conflict of symbol link

Change-Id: If03e015b5f12c5d2a6af3f2bd5224b183e19935f

diff --git a/packaging/capi-mediamuxer.spec b/packaging/capi-mediamuxer.spec
index 2046b00..0f9546b 100755 (executable)
--- a/packaging/capi-mediamuxer.spec
+++ b/packaging/capi-mediamuxer.spec
@@ -1,6 +1,6 @@
 Name:       capi-mediamuxer
 Summary:    A Media Muxer library in Tizen Native API
-Version:    0.1.1
+Version:    0.1.2
 Release:    1
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/mediamuxer_port.c b/src/mediamuxer_port.c
index 777a8be..57df3f6 100644 (file)
--- a/src/mediamuxer_port.c
+++ b/src/mediamuxer_port.c
@@ -25,19 +25,19 @@
 #include <mediamuxer_port.h>
 
 /* function type */
-extern int gst_port_register(media_port_muxer_ops *pOps);
-extern int ffmpeg_port_register(media_port_muxer_ops *pOps);
-extern int custom_port_register(media_port_muxer_ops *pOps);
+extern int gst_mediamuxer_port_register(media_port_muxer_ops *pOps);
+extern int ffmpeg_mediamuxer_port_register(media_port_muxer_ops *pOps);
+extern int custom_mediamuxer_port_register(media_port_muxer_ops *pOps);
 
 /*
   * Sequence of functions should be same as the port enumeration "port_mode"
   * in mx_ini.h file
   */
-typedef int (*register_port)(media_port_muxer_ops *);
-register_port register_port_func[] = {
-       &gst_port_register,
-       &ffmpeg_port_register,
-       &custom_port_register
+typedef int (*register_port_muxer)(media_port_muxer_ops *);
+register_port_muxer register_port_muxer_func[] = {
+       &gst_mediamuxer_port_register,
+       &ffmpeg_mediamuxer_port_register,
+       &custom_mediamuxer_port_register
 };
 
 int mx_create(MMHandleType *muxer)
@@ -68,7 +68,7 @@ int mx_create(MMHandleType *muxer)
                goto ERROR;
        }
 
-       register_port_func[new_muxer->ini.port_type](pOps);
+       register_port_muxer_func[new_muxer->ini.port_type](pOps);
        ret = pOps->init(&new_muxer->mxport_handle);
        MEDIAMUXER_CHECK_SET_AND_PRINT(ret, MX_ERROR_NONE, ret,
                                        MX_NOT_INITIALIZED, "mx_create failed");

diff --git a/src/port_custom/mediamuxer_port_custom.c b/src/port_custom/mediamuxer_port_custom.c
index 036778c..305167a 100644 (file)
--- a/src/port_custom/mediamuxer_port_custom.c
+++ b/src/port_custom/mediamuxer_port_custom.c
@@ -31,7 +31,7 @@ static media_port_muxer_ops def_mux_ops = {
        .set_data_sink = custom_muxer_set_data_sink,
 };
 
-int custom_port_register(media_port_muxer_ops *pOps)
+int custom_mediamuxer_port_register(media_port_muxer_ops *pOps)
 {
        int ret = MX_ERROR_NONE;
        MEDIAMUXER_FENTER();

diff --git a/src/port_ffmpeg/mediamuxer_port_ffmpeg.c b/src/port_ffmpeg/mediamuxer_port_ffmpeg.c
index 0197667..dce359e 100644 (file)
--- a/src/port_ffmpeg/mediamuxer_port_ffmpeg.c
+++ b/src/port_ffmpeg/mediamuxer_port_ffmpeg.c
@@ -31,7 +31,7 @@ static media_port_muxer_ops def_mux_ops = {
        .set_data_sink = ffmpeg_muxer_set_data_sink,
 };
 
-int ffmpeg_port_register(media_port_muxer_ops *pOps)
+int ffmpeg_mediamuxer_port_register(media_port_muxer_ops *pOps)
 {
        int ret = MX_ERROR_NONE;
        MEDIAMUXER_FENTER();

diff --git a/src/port_gst/mediamuxer_port_gst.c b/src/port_gst/mediamuxer_port_gst.c
index e79f923..d2f1ed1 100755 (executable)
--- a/src/port_gst/mediamuxer_port_gst.c
+++ b/src/port_gst/mediamuxer_port_gst.c
@@ -61,7 +61,7 @@ static media_port_muxer_ops def_mux_ops = {
        .set_error_cb = gst_set_error_cb,
 };
 
-int gst_port_register(media_port_muxer_ops *pOps)
+int gst_mediamuxer_port_register(media_port_muxer_ops *pOps)
 {
        int ret = MX_ERROR_NONE;
        MEDIAMUXER_FENTER();