10l in rev290: duplicate declaration of x264_pixel_sub_8x8_mmx.

[x264] / common / common.h

diff --git a/common/common.h b/common/common.h
index a50867f99460b943e52a846a6d2dbef9bc796c8a..e0986c4eab9023dc90eb3973d47bc9048e97f9b6 100644 (file)
--- a/common/common.h
+++ b/common/common.h
@@ -67,6 +67,9 @@ void *x264_malloc( int );
 void *x264_realloc( void *p, int i_size );
 void  x264_free( void * );
 
+/* x264_slurp_file: malloc space for the whole file and read it */
+char *x264_slurp_file( const char *filename );
+
 /* mdate: return the current date in microsecond */
 int64_t x264_mdate( void );
 
@@ -239,6 +242,11 @@ struct x264_t
     x264_pps_t      *pps;
     int             i_idr_pic_id;
 
+    int             dequant4_mf[4][6][4][4];
+    int             dequant8_mf[2][6][8][8];
+    int             quant4_mf[4][6][4][4];
+    int             quant8_mf[2][6][8][8];
+
     /* Slice header */
     x264_slice_header_t sh;
 
@@ -404,9 +412,11 @@ struct x264_t
         } cache;
 
         /* */
+        int     i_qp;       /* current qp */
         int     i_last_qp;  /* last qp */
         int     i_last_dqp; /* last delta qp */
         int     b_variable_qp; /* whether qp is allowed to vary per macroblock */
+        int     b_lossless;
 
         /* B_direct and weighted prediction */
         int     dist_scale_factor[16][16];