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 /libaf | |
| 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 'libaf')
| -rw-r--r-- | libaf/af_lavcac3enc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libaf/af_lavcac3enc.c b/libaf/af_lavcac3enc.c index 10a9eb58c8..ae557579d6 100644 --- a/libaf/af_lavcac3enc.c +++ b/libaf/af_lavcac3enc.c @@ -26,6 +26,7 @@ #include <inttypes.h> #include <assert.h> +#include "libmpcodecs/vd_ffmpeg.h" #include "config.h" #include "af.h" #include "reorder_ch.h" @@ -54,8 +55,6 @@ typedef struct af_ac3enc_s { int min_channel_num; } af_ac3enc_t; -extern int avcodec_initialized; - // Initialization and runtime control static int control(struct af_instance_s *af, int cmd, void *arg) { @@ -287,11 +286,7 @@ static int af_open(af_instance_t* af){ af->data=calloc(1,sizeof(af_data_t)); af->setup=s; - if (!avcodec_initialized){ - avcodec_init(); - avcodec_register_all(); - avcodec_initialized=1; - } + init_avcodec(); s->lavc_acodec = avcodec_find_encoder_by_name("ac3"); if (!s->lavc_acodec) { |