X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fframerate.h;h=d2556356867edcc7d32cacdac82089f9f9153625;hb=3c77584be8fa6833b5cbf9b064ef1120a54fa61f;hp=a42d5af68a2930ccaec7f2c2e2362c122d0069af;hpb=185aa5e896e15ae96145609944bfc6bbb239bc64;p=ffmpeg

diff --git a/libavfilter/framerate.h b/libavfilter/framerate.h
index a42d5af68a2..d2556356867 100644
--- a/libavfilter/framerate.h
+++ b/libavfilter/framerate.h
@@ -19,7 +19,7 @@
 #ifndef AVFILTER_FRAMERATE_H
 #define AVFILTER_FRAMERATE_H
 
-#include "libavutil/pixelutils.h"
+#include "scene_sad.h"
 #include "avfilter.h"
 
 #define BLEND_FUNC_PARAMS const uint8_t *src1, ptrdiff_t src1_linesize, \
@@ -28,8 +28,7 @@
                           ptrdiff_t width, ptrdiff_t height, \
                           int factor1, int factor2, int half
 
-#define BLEND_FACTOR_DEPTH8   7
-#define BLEND_FACTOR_DEPTH16 15
+#define BLEND_FACTOR_DEPTH(n) (n-1)
 
 typedef void (*blend_func)(BLEND_FUNC_PARAMS);
 
@@ -43,12 +42,13 @@ typedef struct FrameRateContext {
     int interp_end;                     ///< end of range to apply linear interpolation
 
     int line_size[4];                   ///< bytes of pixel data per line for each plane
+    int height[4];                      ///< height of each plane
     int vsub;
 
     AVRational srce_time_base;          ///< timebase of source
     AVRational dest_time_base;          ///< timebase of destination
 
-    av_pixelutils_sad_fn sad;           ///< Sum of the absolute difference function (scene detect only)
+    ff_scene_sad_fn sad;                ///< Sum of the absolute difference function (scene detect only)
     double prev_mafd;                   ///< previous MAFD                           (scene detect only)
 
     int blend_factor_max;