diff options
| author | multiple authors <multiple@multiple.x> | 2013-02-05 14:17:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 14:53:53 +0100 |
| commit | 7a4885600ff049d3ea70671facdbd37f92e7789e (patch) | |
| tree | b698295447a3ed1bc55904ebb308bad0f283370c | |
| parent | 14132599a3729b85edd55c9aab09bf4594e4d885 (diff) | |
| download | ffmpeg-7a4885600ff049d3ea70671facdbd37f92e7789e.tar.gz | |
libmpcodecs/vf_spp: update to latest version from mplayer
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/libavcodec.v | 1 | ||||
| -rw-r--r-- | libavfilter/libmpcodecs/vf_spp.c | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/libavcodec.v b/libavcodec/libavcodec.v index 195485e63f..826a547565 100644 --- a/libavcodec/libavcodec.v +++ b/libavcodec/libavcodec.v @@ -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; 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; |