Commit f4373b9a authored by Thomas Guillem's avatar Thomas Guillem

webvtt: rename entry functions

This fixes duplicate symbols with a static build.

(cherry picked from commit 55a13f9a)
Signed-off-by: Thomas Guillem's avatarThomas Guillem <thomas@gllm.fr>
parent cac8a19e
......@@ -2027,9 +2027,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;
......@@ -2044,9 +2044,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;
......
......@@ -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,7 +56,7 @@ 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" )
vlc_module_end ()
......
......@@ -20,12 +20,12 @@
#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 * );
typedef struct webvtt_text_parser_t webvtt_text_parser_t;
......
......@@ -622,7 +622,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;
......@@ -640,7 +640,7 @@ int OpenDemux ( vlc_object_t *p_this )
if( ReadWEBVTT( p_demux ) != VLC_SUCCESS )
{
CloseDemux( p_this );
webvtt_CloseDemux( p_this );
return VLC_EGENERIC;
}
......@@ -653,14 +653,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;
......@@ -682,7 +682,7 @@ int OpenDemuxStream ( vlc_object_t *p_this )
NULL );
if( !p_sys->p_streamparser )
{
CloseDemux( p_this );
webvtt_CloseDemux( p_this );
return VLC_EGENERIC;
}
......@@ -692,7 +692,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;
}
......@@ -702,7 +702,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;
......
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