Cosmetic: update various file headers.

[x264] / common / pixel.h

diff --git a/common/pixel.h b/common/pixel.h
index 0ed1ef4cad22aadaa525574a9300d57eb384c49a..4e157ef62ce6b727c814498fe2129a33cd2bbc55 100644 (file)
--- a/common/pixel.h
+++ b/common/pixel.h
@@ -26,7 +26,6 @@
 typedef int  (*x264_pixel_cmp_t) ( uint8_t *, int, uint8_t *, int );
 typedef void (*x264_pixel_cmp_x3_t) ( uint8_t *, uint8_t *, uint8_t *, uint8_t *, int, int[3] );
 typedef void (*x264_pixel_cmp_x4_t) ( uint8_t *, uint8_t *, uint8_t *, uint8_t *, uint8_t *, int, int[4] );
-typedef int  (*x264_pixel_var_t) ( uint8_t *, int, uint32_t * );
 
 enum
 {
@@ -73,9 +72,11 @@ typedef struct
     x264_pixel_cmp_t fpelcmp[7]; /* either satd or sad for fullpel motion search */
     x264_pixel_cmp_x3_t fpelcmp_x3[7];
     x264_pixel_cmp_x4_t fpelcmp_x4[7];
-    x264_pixel_var_t var[4];
     x264_pixel_cmp_t sad_aligned[7]; /* Aligned SAD for mbcmp */
 
+    int (*var[4])( uint8_t *pix, int stride, uint32_t *sad );
+    uint64_t (*hadamard_ac[4])( uint8_t *pix, int stride );
+
     void (*ssim_4x4x2_core)( const uint8_t *pix1, int stride1,
                              const uint8_t *pix2, int stride2, int sums[2][4] );
     float (*ssim_end4)( int sum0[5][4], int sum1[5][4], int width );