Merge commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83'

[ffmpeg] / libavfilter / deshake.h

diff --git a/libavfilter/deshake.h b/libavfilter/deshake.h
index 615953cfe3ea084024dce69526957ded08df3f95..f61ed80d53a74fb18e98d9ca235274a3ff36a0ab 100644 (file)
--- a/libavfilter/deshake.h
+++ b/libavfilter/deshake.h
@@ -24,8 +24,8 @@
 
 #include "config.h"
 #include "avfilter.h"
-#include "libavcodec/dsputil.h"
 #include "transform.h"
+#include "libavutil/pixelutils.h"
 #if CONFIG_OPENCL
 #include "libavutil/opencl.h"
 #endif
@@ -80,8 +80,7 @@ typedef struct {
     int blocksize;             ///< Size of blocks to compare
     int contrast;              ///< Contrast threshold
     int search;                ///< Motion search method
-    AVCodecContext *avctx;
-    DSPContext c;              ///< Context providing optimized SAD methods
+    av_pixelutils_sad_fn sad;  ///< Sum of the absolute difference function
     Transform last;            ///< Transform from last frame
     int refcount;              ///< Number of reference frames (defines averaging window)
     FILE *fp;