diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-17 23:27:40 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-17 23:27:40 +0200 |
commit | 3a2d1465c88625774530399b06dc4d48b24bb51f (patch) | |
tree | 4be7740e2fca1a95af5ec112526c84ca69b64092 /libavfilter/vf_mpdecimate.c | |
parent | 6be71e9955954422227f9691b4f5367a7169b099 (diff) | |
parent | 2d60444331fca1910510038dd3817bea885c2367 (diff) |
Merge commit '2d60444331fca1910510038dd3817bea885c2367'
* commit '2d60444331fca1910510038dd3817bea885c2367':
dsputil: Split motion estimation compare bits off into their own context
Conflicts:
configure
libavcodec/Makefile
libavcodec/arm/Makefile
libavcodec/dvenc.c
libavcodec/error_resilience.c
libavcodec/h264.h
libavcodec/h264_slice.c
libavcodec/me_cmp.c
libavcodec/me_cmp.h
libavcodec/motion_est.c
libavcodec/motion_est_template.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/me_cmp_init.c
Merged-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 c667a9f4cc..b030f06b19 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/dsputil.h" +#include "libavcodec/me_cmp.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 - DSPContext dspctx; ///< context providing optimized diff routines + MECmpContext mecc; ///< 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; - DSPContext *dspctx = &decimate->dspctx; + MECmpContext *mecc = &decimate->mecc; 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 = dspctx->sum_abs_dctelem(block); + d = mecc->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); - avpriv_dsputil_init(&decimate->dspctx, decimate->avctx); + ff_me_cmp_init(&decimate->mecc, decimate->avctx); ff_pixblockdsp_init(&decimate->pdsp, decimate->avctx); return 0; |