Commit 55b3cfc7 authored by Thomas Guillem's avatar Thomas Guillem

ttml: rename OpenDemux/CloseDemux functions

This fixes duplicate symbols with a static build
parent e26f8431
......@@ -1089,9 +1089,9 @@ static int DecodeBlock( decoder_t *p_dec, block_t *p_block )
}
/*****************************************************************************
* OpenDecoder: probe the decoder and return score
* tt_OpenDecoder: probe the decoder and return score
*****************************************************************************/
int OpenDecoder( vlc_object_t *p_this )
int tt_OpenDecoder( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys;
......@@ -1111,9 +1111,9 @@ int OpenDecoder( vlc_object_t *p_this )
}
/*****************************************************************************
* CloseDecoder: clean up the decoder
* tt_CloseDecoder: clean up the decoder
*****************************************************************************/
void CloseDecoder( vlc_object_t *p_this )
void tt_CloseDecoder( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t *)p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
......
......@@ -43,7 +43,7 @@ vlc_module_begin ()
set_capability( "spu decoder", 10 )
set_shortname( N_("TTML decoder"))
set_description( N_("TTML subtitles decoder") )
set_callbacks( OpenDecoder, CloseDecoder )
set_callbacks( tt_OpenDecoder, tt_CloseDecoder )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_SCODEC )
add_integer( "ttml-align", 0, ALIGN_TEXT, ALIGN_LONGTEXT, false )
......@@ -54,7 +54,7 @@ vlc_module_begin ()
set_capability( "demux", 3 )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_DEMUX )
set_callbacks( OpenDemux, CloseDemux )
set_callbacks( tt_OpenDemux, tt_CloseDemux )
add_shortcut( "ttml" )
vlc_module_end ()
......
......@@ -18,11 +18,11 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
int OpenDemux( vlc_object_t* p_this );
void CloseDemux( demux_t* p_demux );
int tt_OpenDemux( vlc_object_t* p_this );
void tt_CloseDemux( demux_t* p_demux );
int OpenDecoder ( vlc_object_t * );
void CloseDecoder ( vlc_object_t * );
int tt_OpenDecoder ( vlc_object_t * );
void tt_CloseDecoder ( vlc_object_t * );
enum
{
......
......@@ -391,7 +391,7 @@ static int Demux( demux_t* p_demux )
return VLC_DEMUXER_SUCCESS;
}
int OpenDemux( vlc_object_t* p_this )
int tt_OpenDemux( vlc_object_t* p_this )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
......@@ -530,12 +530,12 @@ int OpenDemux( vlc_object_t* p_this )
return VLC_SUCCESS;
error:
CloseDemux( p_demux );
tt_CloseDemux( p_demux );
return VLC_EGENERIC;
}
void CloseDemux( demux_t* p_demux )
void tt_CloseDemux( demux_t* p_demux )
{
demux_sys_t* p_sys = p_demux->p_sys;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment