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 /libmpcodecs/ad_ffmpeg.c | |
| 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 'libmpcodecs/ad_ffmpeg.c')
| -rw-r--r-- | libmpcodecs/ad_ffmpeg.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index b4ecd628c4..fb2d94dbfd 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -25,7 +25,6 @@ #include "options.h" #include "ad_internal.h" -#include "vd_ffmpeg.h" #include "libaf/reorder_ch.h" #include "mpbswap.h" @@ -102,7 +101,6 @@ static int init(sh_audio_t *sh_audio) AVCodec *lavc_codec; mp_msg(MSGT_DECAUDIO,MSGL_V,"FFmpeg's libavcodec audio codec\n"); - init_avcodec(); lavc_codec = avcodec_find_decoder_by_name(sh_audio->codec->dll); if(!lavc_codec){ |