revert 216, another try at max_dec_frame_buffering.

[x264] / common / pixel.h

diff --git a/common/pixel.h b/common/pixel.h
index 63f60fcff1f0de334be32e247afb475fc2b8ba0e..87be5cd238d7420355e1b611abcc9a85274a45b1 100644 (file)
--- a/common/pixel.h
+++ b/common/pixel.h
@@ -24,8 +24,7 @@
 #ifndef _PIXEL_H
 #define _PIXEL_H 1
 
-typedef int  (*x264_pixel_sad_t) ( uint8_t *, int, uint8_t *, int );
-typedef int  (*x264_pixel_satd_t)( uint8_t *, int, uint8_t *, int );
+typedef int  (*x264_pixel_cmp_t) ( uint8_t *, int, uint8_t *, int );
 typedef void (*x264_pixel_avg_t) ( uint8_t *, int, uint8_t *, int );
 typedef void (*x264_pixel_avg_weight_t) ( uint8_t *, int, uint8_t *, int, int );
 
@@ -64,8 +63,10 @@ static const int x264_size2pixel[5][5] = {
 
 typedef struct
 {
-    x264_pixel_sad_t  sad[7];
-    x264_pixel_satd_t satd[7];
+    x264_pixel_cmp_t  sad[7];
+    x264_pixel_cmp_t  ssd[7];
+    x264_pixel_cmp_t satd[7];
+    x264_pixel_cmp_t sa8d[4];
     x264_pixel_avg_t  avg[10];
     x264_pixel_avg_weight_t avg_weight[10];
 } x264_pixel_function_t;