diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-25 21:56:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-26 13:21:07 +0200 |
| commit | c0a586d9d5cd99e9f36e4d190f9aa137803378dc (patch) | |
| tree | 1a293a6c72150ff755e8ee0bff97d11bf2975f6c /libavfilter/vf_mpdecimate.c | |
| parent | 9a6ca20ef6755af33bdf4c8a2fbc60fdb36e9b42 (diff) | |
reintroduce avpriv_dsputil_init() to maintain ABI until next soname bump
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_mpdecimate.c')
| -rw-r--r-- | libavfilter/vf_mpdecimate.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavfilter/vf_mpdecimate.c b/libavfilter/vf_mpdecimate.c index b030f06b19..c667a9f4cc 100644 --- a/libavfilter/vf_mpdecimate.c +++ b/libavfilter/vf_mpdecimate.c @@ -27,7 +27,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/timestamp.h" -#include "libavcodec/me_cmp.h" +#include "libavcodec/dsputil.h" #include "libavcodec/pixblockdsp.h" #include "avfilter.h" #include "internal.h" @@ -49,7 +49,7 @@ typedef struct { int hsub, vsub; ///< chroma subsampling values AVFrame *ref; ///< reference picture - MECmpContext mecc; ///< context providing optimized diff routines + DSPContext dspctx; ///< context providing optimized diff routines PixblockDSPContext pdsp; AVCodecContext *avctx; ///< codec context required for the DSPContext } DecimateContext; @@ -76,7 +76,7 @@ static int diff_planes(AVFilterContext *ctx, int w, int h) { DecimateContext *decimate = ctx->priv; - MECmpContext *mecc = &decimate->mecc; + DSPContext *dspctx = &decimate->dspctx; PixblockDSPContext *pdsp = &decimate->pdsp; int x, y; @@ -90,7 +90,7 @@ static int diff_planes(AVFilterContext *ctx, pdsp->diff_pixels(block, cur+x+y*linesize, ref+x+y*linesize, linesize); - d = mecc->sum_abs_dctelem(block); + d = dspctx->sum_abs_dctelem(block); if (d > decimate->hi) return 1; if (d > decimate->lo) { @@ -143,7 +143,7 @@ static av_cold int init(AVFilterContext *ctx) decimate->avctx = avcodec_alloc_context3(NULL); if (!decimate->avctx) return AVERROR(ENOMEM); - ff_me_cmp_init(&decimate->mecc, decimate->avctx); + avpriv_dsputil_init(&decimate->dspctx, decimate->avctx); ff_pixblockdsp_init(&decimate->pdsp, decimate->avctx); return 0; |