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>

6 files changed, 12 insertions, 14 deletions

diff --git a/libavfilter/deshake.h b/libavfilter/deshake.h
index 615953cfe3..568d022602 100644
--- a/libavfilter/deshake.h
+++ b/libavfilter/deshake.h
@@ -24,7 +24,7 @@
 
 #include "config.h"
 #include "avfilter.h"
-#include "libavcodec/dsputil.h"
+#include "libavcodec/me_cmp.h"
 #include "transform.h"
 #if CONFIG_OPENCL
 #include "libavutil/opencl.h"
@@ -81,7 +81,7 @@ typedef struct {
     int contrast;              ///< Contrast threshold
     int search;                ///< Motion search method
     AVCodecContext *avctx;
-    DSPContext c;              ///< Context providing optimized SAD methods
+    MECmpContext c;            ///< Context providing optimized SAD methods
     Transform last;            ///< Transform from last frame
     int refcount;              ///< Number of reference frames (defines averaging window)
     FILE *fp;
diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c
index c7c53b43ed..3579665bcb 100644
--- a/libavfilter/f_select.c
+++ b/libavfilter/f_select.c
@@ -35,7 +35,7 @@
 #include "video.h"
 
 #if CONFIG_AVCODEC
-#include "libavcodec/dsputil.h"
+#include "libavcodec/me_cmp.h"
 #endif
 
 static const char *const var_names[] = {
@@ -146,7 +146,7 @@ typedef struct SelectContext {
     int do_scene_detect;            ///< 1 if the expression requires scene detection variables, 0 otherwise
 #if CONFIG_AVCODEC
     AVCodecContext *avctx;          ///< codec context required for the DSPContext (scene detect only)
-    DSPContext c;                   ///< context providing optimized SAD methods   (scene detect only)
+    MECmpContext c;                 ///< context providing optimized SAD methods   (scene detect only)
     double prev_mafd;               ///< previous MAFD                             (scene detect only)
 #endif
     AVFrame *prev_picref; ///< previous frame                            (scene detect only)
@@ -245,7 +245,7 @@ static int config_input(AVFilterLink *inlink)
         select->avctx = avcodec_alloc_context3(NULL);
         if (!select->avctx)
             return AVERROR(ENOMEM);
-        avpriv_dsputil_init(&select->c, select->avctx);
+        ff_me_cmp_init(&select->c, select->avctx);
     }
 #endif
     return 0;
diff --git a/libavfilter/libmpcodecs/vf_fspp.c b/libavfilter/libmpcodecs/vf_fspp.c
index e1b26bc625..c4a36ef8a8 100644
--- a/libavfilter/libmpcodecs/vf_fspp.c
+++ b/libavfilter/libmpcodecs/vf_fspp.c
@@ -53,7 +53,6 @@
 #include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
 
 #undef free
 #undef malloc
diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c
index 50aa451a32..9a56b71b39 100644
--- a/libavfilter/vf_deshake.c
+++ b/libavfilter/vf_deshake.c
@@ -57,7 +57,7 @@
 #include "libavutil/mem.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
-#include "libavcodec/dsputil.h"
+#include "libavcodec/me_cmp.h"
 
 #include "deshake.h"
 #include "deshake_opencl.h"
@@ -414,7 +414,7 @@ static int config_props(AVFilterLink *link)
     deshake->last.zoom = 0;
 
     deshake->avctx = avcodec_alloc_context3(NULL);
-    avpriv_dsputil_init(&deshake->c, deshake->avctx);
+    ff_me_cmp_init(&deshake->c, deshake->avctx);
 
     return 0;
 }
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;
diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c
index 4e4a5795f4..bb85778647 100644
--- a/libavfilter/vf_spp.c
+++ b/libavfilter/vf_spp.c
@@ -31,7 +31,6 @@
  * ported by Clément Bœsch for FFmpeg.
  */
 
-#include "libavcodec/dsputil.h"
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"