[vlc-commits] webvtt: rename entry functions
Thomas Guillem
git at videolan.org
Thu Feb 1 15:03:37 CET 2018
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Feb 1 15:03:06 2018 +0100| [55a13f9a4629605d3404f060bd8a2a8f5101d089] | committer: Thomas Guillem
webvtt: rename entry functions
This fixes duplicate symbols with a static build.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=55a13f9a4629605d3404f060bd8a2a8f5101d089
---
modules/codec/webvtt/encvtt.c | 4 ++--
modules/codec/webvtt/subsvtt.c | 8 ++++----
modules/codec/webvtt/webvtt.c | 8 ++++----
modules/codec/webvtt/webvtt.h | 14 +++++++-------
modules/demux/webvtt.c | 14 +++++++-------
5 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/modules/codec/webvtt/encvtt.c b/modules/codec/webvtt/encvtt.c
index db7dfb2e16..6f1da70246 100644
--- a/modules/codec/webvtt/encvtt.c
+++ b/modules/codec/webvtt/encvtt.c
@@ -31,7 +31,7 @@
static block_t *Encode ( encoder_t *, subpicture_t * );
-int OpenEncoder( vlc_object_t *p_this )
+int webvtt_OpenEncoder( vlc_object_t *p_this )
{
encoder_t *p_enc = (encoder_t *)p_this;
@@ -46,7 +46,7 @@ int OpenEncoder( vlc_object_t *p_this )
}
-void CloseEncoder( vlc_object_t *p_this )
+void webvtt_CloseEncoder( vlc_object_t *p_this )
{
(void)p_this;
}
diff --git a/modules/codec/webvtt/subsvtt.c b/modules/codec/webvtt/subsvtt.c
index d22d80d94a..c2dc42cbc0 100644
--- a/modules/codec/webvtt/subsvtt.c
+++ b/modules/codec/webvtt/subsvtt.c
@@ -2035,9 +2035,9 @@ static int DecodeBlock( decoder_t *p_dec, block_t *p_block )
}
/*****************************************************************************
- * CloseDecoder: clean up the decoder
+ * webvtt_CloseDecoder: clean up the decoder
*****************************************************************************/
-void CloseDecoder( vlc_object_t *p_this )
+void webvtt_CloseDecoder( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t *)p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
@@ -2052,9 +2052,9 @@ void CloseDecoder( vlc_object_t *p_this )
}
/*****************************************************************************
- * OpenDecoder: probe the decoder and return score
+ * webvtt_OpenDecoder: probe the decoder and return score
*****************************************************************************/
-int OpenDecoder( vlc_object_t *p_this )
+int webvtt_OpenDecoder( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys;
diff --git a/modules/codec/webvtt/webvtt.c b/modules/codec/webvtt/webvtt.c
index adf22adacc..360ba1810a 100644
--- a/modules/codec/webvtt/webvtt.c
+++ b/modules/codec/webvtt/webvtt.c
@@ -39,7 +39,7 @@ vlc_module_begin ()
set_capability( "spu decoder", 10 )
set_shortname( N_("WEBVTT decoder"))
set_description( N_("WEBVTT subtitles decoder") )
- set_callbacks( OpenDecoder, CloseDecoder )
+ set_callbacks( webvtt_OpenDecoder, webvtt_CloseDecoder )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_SCODEC )
add_submodule()
@@ -48,7 +48,7 @@ vlc_module_begin ()
set_capability( "demux", 3 )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_DEMUX )
- set_callbacks( OpenDemux, CloseDemux )
+ set_callbacks( webvtt_OpenDemux, webvtt_CloseDemux )
add_shortcut( "webvtt" )
add_submodule()
set_shortname( "WEBVTT" )
@@ -56,14 +56,14 @@ vlc_module_begin ()
set_capability( "demux", 0 )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_DEMUX )
- set_callbacks( OpenDemuxStream, CloseDemux )
+ set_callbacks( webvtt_OpenDemuxStream, webvtt_CloseDemux )
add_shortcut( "webvttstream" )
#ifdef ENABLE_SOUT
add_submodule()
set_description( "WEBVTT text encoder" )
set_capability( "encoder", 101 )
set_subcategory( SUBCAT_INPUT_SCODEC )
- set_callbacks( OpenEncoder, CloseEncoder )
+ set_callbacks( webvtt_OpenEncoder, webvtt_CloseEncoder )
#endif
vlc_module_end ()
diff --git a/modules/codec/webvtt/webvtt.h b/modules/codec/webvtt/webvtt.h
index 7c5d84df1d..a45013d909 100644
--- a/modules/codec/webvtt/webvtt.h
+++ b/modules/codec/webvtt/webvtt.h
@@ -20,16 +20,16 @@
#ifndef WEBVTT_H
#define WEBVTT_H
-int OpenDecoder ( vlc_object_t * );
-void CloseDecoder ( vlc_object_t * );
+int webvtt_OpenDecoder ( vlc_object_t * );
+void webvtt_CloseDecoder ( vlc_object_t * );
-int OpenDemux ( vlc_object_t * );
-int OpenDemuxStream (vlc_object_t *);
-void CloseDemux ( vlc_object_t * );
+int webvtt_OpenDemux ( vlc_object_t * );
+int webvtt_OpenDemuxStream (vlc_object_t *);
+void webvtt_CloseDemux ( vlc_object_t * );
#ifdef ENABLE_SOUT
-int OpenEncoder ( vlc_object_t * );
-void CloseEncoder ( vlc_object_t * );
+int webvtt_OpenEncoder ( vlc_object_t * );
+void webvtt_CloseEncoder ( vlc_object_t * );
#endif
typedef struct webvtt_text_parser_t webvtt_text_parser_t;
diff --git a/modules/demux/webvtt.c b/modules/demux/webvtt.c
index 1b95a5c0cc..14d37dda00 100644
--- a/modules/demux/webvtt.c
+++ b/modules/demux/webvtt.c
@@ -627,7 +627,7 @@ static int ProbeWEBVTT( demux_t *p_demux )
/*****************************************************************************
* Module initializers
*****************************************************************************/
-int OpenDemux ( vlc_object_t *p_this )
+int webvtt_OpenDemux ( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
@@ -645,7 +645,7 @@ int OpenDemux ( vlc_object_t *p_this )
if( ReadWEBVTT( p_demux ) != VLC_SUCCESS )
{
- CloseDemux( p_this );
+ webvtt_CloseDemux( p_this );
return VLC_EGENERIC;
}
@@ -658,14 +658,14 @@ int OpenDemux ( vlc_object_t *p_this )
es_format_Clean( &fmt );
if( p_sys->es == NULL )
{
- CloseDemux( p_this );
+ webvtt_CloseDemux( p_this );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
-int OpenDemuxStream ( vlc_object_t *p_this )
+int webvtt_OpenDemuxStream ( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
@@ -687,7 +687,7 @@ int OpenDemuxStream ( vlc_object_t *p_this )
NULL );
if( !p_sys->p_streamparser )
{
- CloseDemux( p_this );
+ webvtt_CloseDemux( p_this );
return VLC_EGENERIC;
}
@@ -697,7 +697,7 @@ int OpenDemuxStream ( vlc_object_t *p_this )
es_format_Clean( &fmt );
if( p_sys->es == NULL )
{
- CloseDemux( p_this );
+ webvtt_CloseDemux( p_this );
return VLC_EGENERIC;
}
@@ -707,7 +707,7 @@ int OpenDemuxStream ( vlc_object_t *p_this )
/*****************************************************************************
* Close: Close subtitle demux
*****************************************************************************/
-void CloseDemux( vlc_object_t *p_this )
+void webvtt_CloseDemux( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
More information about the vlc-commits
mailing list