summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-07-18 00:28:22 +0300
committerUoti Urpala <uau@mplayer2.org>2011-07-18 00:57:05 +0300
commita4f41308190b79d79a5ac7a50791332e5c1d5600 (patch)
tree5207b45480ff2317544e17118a58e321160f856c /libmpdemux/demuxer.c
parent4e2b15fc5e5f457f62605262a46962b5fd63ff99 (diff)
downloadmpv-a4f41308190b79d79a5ac7a50791332e5c1d5600.tar.bz2
mpv-a4f41308190b79d79a5ac7a50791332e5c1d5600.tar.xz
cleanup: do libav* initialization on startup
Do the global initialization of libavcodec and libavformat (avcodec_register_all(), av_register_all()) immediately on program startup and remove the initialization calls from various individual modules that use libavcodec/libavformat functionality.
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index b504ad4893..276d62dbae 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -41,7 +41,6 @@
#include "libaf/af_format.h"
#include "libmpcodecs/dec_teletext.h"
-#include "libmpcodecs/vd_ffmpeg.h"
#ifdef CONFIG_FFMPEG
#include "libavcodec/avcodec.h"
@@ -495,8 +494,6 @@ static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parse
{
enum CodecID codec_id = CODEC_ID_NONE;
- init_avcodec();
-
switch (format) {
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 0)
case MKTAG('M', 'P', '4', 'L'):