Commit c6e4f569 authored by Thomas Guillem's avatar Thomas Guillem

avcodec: rename entry functions

This fixes duplicate symbols with a static build.
parent d1d68f78
......@@ -147,7 +147,7 @@ vlc_module_begin ()
set_section( N_("Encoding") , NULL )
set_description( N_("FFmpeg audio/video encoder") )
set_capability( "encoder", 100 )
set_callbacks( OpenEncoder, CloseEncoder )
set_callbacks( InitVideoEnc, EndVideoEnc )
/* removed in 2.1.0 */
add_obsolete_string( "sout-ffmpeg-codec" )
......
......@@ -31,8 +31,8 @@ vlc_fourcc_t GetVlcFourcc( unsigned i_ffmpeg_codec );
vlc_fourcc_t GetVlcAudioFormat( int i_sample_fmt );
/* Video encoder module */
int OpenEncoder ( vlc_object_t * );
void CloseEncoder( vlc_object_t * );
int InitVideoEnc ( vlc_object_t * );
void EndVideoEnc( vlc_object_t * );
/* Video Decoder */
int InitVideoDec( vlc_object_t * );
......
......@@ -63,9 +63,6 @@
/*****************************************************************************
* Local prototypes
*****************************************************************************/
int OpenEncoder ( vlc_object_t * );
void CloseEncoder( vlc_object_t * );
static block_t *EncodeVideo( encoder_t *, picture_t * );
static block_t *EncodeAudio( encoder_t *, block_t * );
......@@ -235,7 +232,7 @@ static const int DEFAULT_ALIGN = 0;
/*****************************************************************************
* OpenEncoder: probe the encoder
* InitVideoEnc: probe the encoder
*****************************************************************************/
static void probe_video_frame_rate( encoder_t *p_enc, AVCodecContext *p_context, AVCodec *p_codec )
{
......@@ -294,7 +291,7 @@ static void add_av_option_float( encoder_t *p_enc, AVDictionary** pp_dict, const
msg_Warn( p_enc, "Failed to set encoder option %s", psz_name );
}
int OpenEncoder( vlc_object_t *p_this )
int InitVideoEnc( vlc_object_t *p_this )
{
encoder_t *p_enc = (encoder_t *)p_this;
encoder_sys_t *p_sys;
......@@ -1421,9 +1418,9 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
}
/*****************************************************************************
* CloseEncoder: libavcodec encoder destruction
* EndVideoEnc: libavcodec encoder destruction
*****************************************************************************/
void CloseEncoder( vlc_object_t *p_this )
void EndVideoEnc( vlc_object_t *p_this )
{
encoder_t *p_enc = (encoder_t *)p_this;
encoder_sys_t *p_sys = p_enc->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