diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-07-18 00:28:22 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-07-18 00:57:05 +0300 |
| commit | a4f41308190b79d79a5ac7a50791332e5c1d5600 (patch) | |
| tree | 5207b45480ff2317544e17118a58e321160f856c /libmpdemux | |
| parent | 4e2b15fc5e5f457f62605262a46962b5fd63ff99 (diff) | |
| download | mpv-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')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_rtp_codec.cpp | 1 | ||||
| -rw-r--r-- | libmpdemux/demuxer.c | 3 |
3 files changed, 0 insertions, 6 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 0b8c9190a4..545e3bdace 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -162,8 +162,6 @@ static int lavf_check_file(demuxer_t *demuxer) demuxer->priv = calloc(sizeof(lavf_priv_t), 1); priv = demuxer->priv; - av_register_all(); - char *format = lavfdopts->format; if (!format) format = demuxer->stream->lavf_type; diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp index f0c3476aa5..68b1964c0c 100644 --- a/libmpdemux/demux_rtp_codec.cpp +++ b/libmpdemux/demux_rtp_codec.cpp @@ -137,7 +137,6 @@ void rtpCodecInitialize_video(demuxer_t* demuxer, #ifdef CONFIG_FFMPEG int fooLen; const uint8_t* fooData; - avcodec_register_all(); h264parserctx = av_parser_init(CODEC_ID_H264); avcctx = avcodec_alloc_context(); // Pass the config to the parser 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'): |