From f2899d96eecc7de5a3f4b2ef231e514085e467e0 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 4 Sep 2010 08:11:31 +0000 Subject: Add central init_avcodec() to avoid duplicated libavcodec init code Patch by Vlad Seryakov, vseryakov gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32043 b3059339-0415-0410-9bf9-f77b7e298cf2 Refactor more instances of avcodec_initialized handling into init_avcodec(). This is a leftover from the previous commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32044 b3059339-0415-0410-9bf9-f77b7e298cf2 Add missing #include for vd_ffmpeg.h; fixes the warning: libmpcodecs/vf_zrmjpeg.c:472: warning: implicit declaration of function 'init_avcodec' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32176 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 837faa6b94..9906ec85de 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -41,6 +41,7 @@ #include "libaf/af_format.h" #include "libmpcodecs/dec_teletext.h" +#include "libmpcodecs/vd_ffmpeg.h" #include "ass_mp.h" @@ -439,12 +440,9 @@ static void ds_add_packet_internal(demux_stream_t *ds, demux_packet_t *dp) static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parser, unsigned format) { enum CodecID codec_id = CODEC_ID_NONE; - extern int avcodec_initialized; - if (!avcodec_initialized) { - avcodec_init(); - avcodec_register_all(); - avcodec_initialized = 1; - } + + init_avcodec(); + switch (format) { case 0x2000: case 0x332D6361: -- cgit v1.2.3