Commit 5317a381 authored by Thomas Guillem's avatar Thomas Guillem

avformat: rename OpenDemux/CloseDemux functions

This fixes duplicate symbols with a static build.
parent 55b3cfc7
......@@ -41,7 +41,7 @@ vlc_module_begin ()
set_description( N_("Avformat demuxer" ) )
set_shortname( N_("Avformat") )
set_capability( "demux", 2 )
set_callbacks( OpenDemux, CloseDemux )
set_callbacks( avformat_OpenDemux, avformat_CloseDemux )
set_section( N_("Demuxer"), NULL )
add_string( "avformat-format", NULL, FORMAT_TEXT, FORMAT_LONGTEXT, true )
add_obsolete_string("ffmpeg-format") /* removed since 2.1.0 */
......@@ -57,7 +57,7 @@ vlc_module_begin ()
add_string( "sout-avformat-mux", NULL, MUX_TEXT, MUX_LONGTEXT, true )
add_obsolete_string("ffmpeg-mux") /* removed since 2.1.0 */
add_string( "sout-avformat-options", NULL, AV_OPTIONS_TEXT, AV_OPTIONS_LONGTEXT, true )
set_callbacks( OpenMux, CloseMux )
set_callbacks( avformat_OpenMux, avformat_CloseMux )
#endif
#ifndef MERGE_FFMPEG
vlc_module_end ()
......
......@@ -25,12 +25,12 @@ void LibavcodecCallback( void *p_opaque, int i_level,
const char *psz_format, va_list va );
/* Demux module */
int OpenDemux ( vlc_object_t * );
void CloseDemux( vlc_object_t * );
int avformat_OpenDemux ( vlc_object_t * );
void avformat_CloseDemux( vlc_object_t * );
/* Mux module */
int OpenMux ( vlc_object_t * );
void CloseMux( vlc_object_t * );
int avformat_OpenMux ( vlc_object_t * );
void avformat_CloseMux( vlc_object_t * );
#define MUX_TEXT N_("Avformat mux")
#define MUX_LONGTEXT N_("Force use of a specific avformat muxer.")
......
......@@ -148,7 +148,7 @@ static void get_rotation(es_format_t *fmt, AVStream *s)
}
}
int OpenDemux( vlc_object_t *p_this )
int avformat_OpenDemux( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
......@@ -288,7 +288,7 @@ int OpenDemux( vlc_object_t *p_this )
if( !p_io_buffer )
{
free( psz_url );
CloseDemux( p_this );
avformat_CloseDemux( p_this );
return VLC_ENOMEM;
}
......@@ -297,7 +297,7 @@ int OpenDemux( vlc_object_t *p_this )
{
av_free( p_io_buffer );
free( psz_url );
CloseDemux( p_this );
avformat_CloseDemux( p_this );
return VLC_ENOMEM;
}
......@@ -307,7 +307,7 @@ int OpenDemux( vlc_object_t *p_this )
{
av_free( p_io_buffer );
free( psz_url );
CloseDemux( p_this );
avformat_CloseDemux( p_this );
return VLC_ENOMEM;
}
......@@ -322,7 +322,7 @@ int OpenDemux( vlc_object_t *p_this )
av_free( pb );
p_sys->ic = NULL;
free( psz_url );
CloseDemux( p_this );
avformat_CloseDemux( p_this );
return VLC_EGENERIC;
}
free( psz_url );
......@@ -357,13 +357,13 @@ int OpenDemux( vlc_object_t *p_this )
if( !nb_streams )
{
msg_Err( p_demux, "No streams found");
CloseDemux( p_this );
avformat_CloseDemux( p_this );
return VLC_EGENERIC;
}
p_sys->tracks = calloc( nb_streams, sizeof(*p_sys->tracks) );
if( !p_sys->tracks )
{
CloseDemux( p_this );
avformat_CloseDemux( p_this );
return VLC_ENOMEM;
}
......@@ -697,7 +697,7 @@ int OpenDemux( vlc_object_t *p_this )
/*****************************************************************************
* Close
*****************************************************************************/
void CloseDemux( vlc_object_t *p_this )
void avformat_CloseDemux( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
......
......@@ -84,7 +84,7 @@ static int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size,
/*****************************************************************************
* Open
*****************************************************************************/
int OpenMux( vlc_object_t *p_this )
int avformat_OpenMux( vlc_object_t *p_this )
{
AVOutputFormat *file_oformat;
sout_mux_t *p_mux = (sout_mux_t*)p_this;
......@@ -163,7 +163,7 @@ int OpenMux( vlc_object_t *p_this )
/*****************************************************************************
* Close
*****************************************************************************/
void CloseMux( vlc_object_t *p_this )
void avformat_CloseMux( vlc_object_t *p_this )
{
sout_mux_t *p_mux = (sout_mux_t*)p_this;
sout_mux_sys_t *p_sys = p_mux->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