libmpcodecs/vf_spp: update to latest version from mplayer
authormultiple authors <multiple@multiple.x>
Tue, 5 Feb 2013 13:17:54 +0000 (14:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Feb 2013 13:53:53 +0000 (14:53 +0100)
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libavcodec.v
libavfilter/libmpcodecs/vf_spp.c

index 195485e..826a547 100644 (file)
@@ -4,6 +4,7 @@ LIBAVCODEC_$MAJOR {
                 audio_resample;
                 audio_resample_close;
                 dsputil_init;
+                ff_dsputil_init;
                 ff_find_pix_fmt;
                 ff_framenum_to_drop_timecode;
                 ff_framenum_to_smtpe_timecode;
index f821374..75ede23 100644 (file)
@@ -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;