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/vf_spp.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/vf_spp.c')
| -rw-r--r-- | libmpcodecs/vf_spp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpcodecs/vf_spp.c b/libmpcodecs/vf_spp.c index e53a95174b..5a4214d872 100644 --- a/libmpcodecs/vf_spp.c +++ b/libmpcodecs/vf_spp.c @@ -44,6 +44,7 @@ #include "img_format.h" #include "mp_image.h" #include "vf.h" +#include "vd_ffmpeg.h" #include "libvo/fastmemcpy.h" #define XMIN(a,b) ((a) < (b) ? (a) : (b)) @@ -570,7 +571,7 @@ static int vf_open(vf_instance_t *vf, char *args){ vf->priv=malloc(sizeof(struct vf_priv_s)); memset(vf->priv, 0, sizeof(struct vf_priv_s)); - avcodec_init(); + init_avcodec(); vf->priv->avctx= avcodec_alloc_context(); dsputil_init(&vf->priv->dsp, vf->priv->avctx); |