Mercurial > mplayer.hg
diff libmpdemux/demuxer.c @ 31960:1ba5eef167aa
Refactor more instances of avcodec_initialized handling into init_avcodec().
This is a leftover from the previous commit.
author | diego |
---|---|
date | Sat, 04 Sep 2010 08:36:38 +0000 |
parents | fc0217dee42c |
children | f6249bc89c38 |
line wrap: on
line diff
--- a/libmpdemux/demuxer.c Sat Sep 04 08:11:31 2010 +0000 +++ b/libmpdemux/demuxer.c Sat Sep 04 08:36:38 2010 +0000 @@ -42,6 +42,7 @@ #include "libaf/af_format.h" #include "libmpcodecs/dec_teletext.h" +#include "libmpcodecs/vd_ffmpeg.h" #ifdef CONFIG_ASS #include "libass/ass.h" @@ -460,12 +461,9 @@ 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: