diff options
| author | rogerdpack <rogerpack2005@gmail.com> | 2013-01-15 19:09:15 -0700 |
|---|---|---|
| committer | rogerdpack <rogerpack2005@gmail.com> | 2013-01-15 19:09:15 -0700 |
| commit | c540312ac3b58e0bbd751844fc2c47c6e3713cf5 (patch) | |
| tree | fcf92b1c0f1772b379828125c2555a47d1c81c6b /libavfilter/libmpcodecs/vf_spp.c | |
| parent | 47e88486b4b3b3de992b07f89dfaedf410a8bd5e (diff) | |
| parent | 2b20397e1fbe52db800ef5deb810f7bc2602f248 (diff) | |
| download | ffmpeg-c540312ac3b58e0bbd751844fc2c47c6e3713cf5.tar.gz | |
Merge remote-tracking branch 'origin/master' into combined
Diffstat (limited to 'libavfilter/libmpcodecs/vf_spp.c')
| -rw-r--r-- | libavfilter/libmpcodecs/vf_spp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavfilter/libmpcodecs/vf_spp.c b/libavfilter/libmpcodecs/vf_spp.c index f821374e06..75ede23ccb 100644 --- a/libavfilter/libmpcodecs/vf_spp.c +++ b/libavfilter/libmpcodecs/vf_spp.c @@ -37,6 +37,7 @@ #include "mp_msg.h" #include "cpudetect.h" +#include "libavutil/common.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavcodec/avcodec.h" @@ -49,7 +50,7 @@ #include "img_format.h" #include "mp_image.h" #include "vf.h" -#include "vd_ffmpeg.h" +#include "av_helpers.h" #include "libvo/fastmemcpy.h" #define XMIN(a,b) ((a) < (b) ? (a) : (b)) @@ -578,8 +579,8 @@ static int vf_open(vf_instance_t *vf, char *args){ ff_init_avcodec(); - vf->priv->avctx= avcodec_alloc_context(); - dsputil_init(&vf->priv->dsp, vf->priv->avctx); + vf->priv->avctx= avcodec_alloc_context3(NULL); + ff_dsputil_init(&vf->priv->dsp, vf->priv->avctx); vf->priv->log2_count= 3; |