diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-09-04 08:11:31 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:15:51 +0200 |
| commit | f2899d96eecc7de5a3f4b2ef231e514085e467e0 (patch) | |
| tree | 43afa4796389fd043b0b6d8172a71b069598bb0b /libmpcodecs/ad_ffmpeg.c | |
| parent | a92b4adf61c4f2a77822326d18b983e7e8fb21fb (diff) | |
| download | mpv-f2899d96eecc7de5a3f4b2ef231e514085e467e0.tar.bz2 mpv-f2899d96eecc7de5a3f4b2ef231e514085e467e0.tar.xz | |
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
Diffstat (limited to 'libmpcodecs/ad_ffmpeg.c')
| -rw-r--r-- | libmpcodecs/ad_ffmpeg.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index 6b7ca97885..6dd5dcf492 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -25,6 +25,7 @@ #include "options.h" #include "ad_internal.h" +#include "vd_ffmpeg.h" #include "libaf/reorder_ch.h" #include "mpbswap.h" @@ -44,7 +45,6 @@ LIBAD_EXTERN(ffmpeg) #include "libavcodec/avcodec.h" -extern int avcodec_initialized; static int preinit(sh_audio_t *sh) { @@ -99,11 +99,7 @@ static int init(sh_audio_t *sh_audio) AVCodec *lavc_codec; mp_msg(MSGT_DECAUDIO,MSGL_V,"FFmpeg's libavcodec audio codec\n"); - if(!avcodec_initialized){ - avcodec_init(); - avcodec_register_all(); - avcodec_initialized=1; - } + init_avcodec(); lavc_codec = avcodec_find_decoder_by_name(sh_audio->codec->dll); if(!lavc_codec){ |