[vlc-commits] avparser: rename OpenPacketizer/ClosePacketizer

[Thomas Guillem]

vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue May 29 15:53:39 2018 +0200| [7f10cebab07b66ddf60e5adfc46d210375452388] | committer: Thomas Guillem

avparser: rename OpenPacketizer/ClosePacketizer

This fixes duplicate symbols with a static build.

(cherry picked from commit 6fd53a76d6fa1b1d0d682ca9d238b5e8a254be12)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=7f10cebab07b66ddf60e5adfc46d210375452388
---

 modules/packetizer/avparser.c | 12 ++++++------
 modules/packetizer/avparser.h |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/packetizer/avparser.c b/modules/packetizer/avparser.c
index 364141ac1f..1dfa9dffaf 100644
--- a/modules/packetizer/avparser.c
+++ b/modules/packetizer/avparser.c
@@ -65,9 +65,9 @@ static block_t * PacketizeClosed( decoder_t *, block_t ** );
  *****************************************************************************/
 static void FlushPacketizer( decoder_t *p_dec )
 {
-    ClosePacketizer( VLC_OBJECT( p_dec ) );
+    avparser_ClosePacketizer( VLC_OBJECT( p_dec ) );
     p_dec->p_sys = NULL;
-    int res = OpenPacketizer( VLC_OBJECT( p_dec ) );
+    int res = avparser_OpenPacketizer( VLC_OBJECT( p_dec ) );
     if ( res != VLC_SUCCESS )
     {
         msg_Err( p_dec, "failed to flush with error %d", res );
@@ -76,12 +76,12 @@ static void FlushPacketizer( decoder_t *p_dec )
 }
 
 /*****************************************************************************
- * OpenPacketizer: probe the packetizer and return score
+ * avparser_OpenPacketizer: probe the packetizer and return score
  *****************************************************************************
  * Tries to launch a decoder and return score so that the interface is able
  * to choose.
  *****************************************************************************/
-int OpenPacketizer( vlc_object_t *p_this )
+int avparser_OpenPacketizer( vlc_object_t *p_this )
 {
     decoder_t     *p_dec = (decoder_t*)p_this;
     decoder_sys_t *p_sys;
@@ -137,9 +137,9 @@ int OpenPacketizer( vlc_object_t *p_this )
 }
 
 /*****************************************************************************
- * ClosePacketizer:
+ * avparser_ClosePacketizer:
  *****************************************************************************/
-void ClosePacketizer( vlc_object_t *p_this )
+void avparser_ClosePacketizer( vlc_object_t *p_this )
 {
     decoder_t     *p_dec = (decoder_t*)p_this;
     if (likely( p_dec->p_sys != NULL ))
diff --git a/modules/packetizer/avparser.h b/modules/packetizer/avparser.h
index a782e829e3..73f4a1afd6 100644
--- a/modules/packetizer/avparser.h
+++ b/modules/packetizer/avparser.h
@@ -40,12 +40,12 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-int  OpenPacketizer ( vlc_object_t * );
-void ClosePacketizer( vlc_object_t * );
+int  avparser_OpenPacketizer ( vlc_object_t * );
+void avparser_ClosePacketizer( vlc_object_t * );
 
 #define AVPARSER_MODULE \
     set_category( CAT_SOUT )                            \
     set_subcategory( SUBCAT_SOUT_PACKETIZER )           \
     set_description( N_("avparser packetizer") )        \
     set_capability( "packetizer", 20 )                   \
-    set_callbacks( OpenPacketizer, ClosePacketizer )
+    set_callbacks( avparser_OpenPacketizer, avparser_ClosePacketizer )