Add support for the new (4:4:4) colorspaces to x264_picture_alloc

[x264] / encoder / me.h

diff --git a/encoder/me.h b/encoder/me.h
index fd99a5d9f16a7356470fde0bf98bca8b96b609c3..8b5baa01373fec649f4c2456257fc90f2e5aa24f 100644 (file)
--- a/encoder/me.h
+++ b/encoder/me.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * me.h: motion estimation
  *****************************************************************************
- * Copyright (C) 2003-2010 x264 project
+ * Copyright (C) 2003-2011 x264 project
  *
  * Authors: Loren Merritt <lorenm@u.washington.edu>
  *          Laurent Aimar <fenrir@via.ecp.fr>
@@ -41,11 +41,11 @@ typedef struct
     int      i_ref;
     const x264_weight_t *weight;
 
-    pixel *p_fref[6];
+    pixel *p_fref[12];
     pixel *p_fref_w;
     pixel *p_fenc[3];
     uint16_t *integral;
-    int      i_stride[2];
+    int      i_stride[3];
 
     ALIGNED_4( int16_t mvp[2] );
 
@@ -55,7 +55,8 @@ typedef struct
     ALIGNED_4( int16_t mv[2] );
 } ALIGNED_16( x264_me_t );
 
-typedef struct {
+typedef struct
+{
     int sad;
     int16_t mv[2];
 } mvsad_t;
@@ -71,7 +72,7 @@ void x264_me_refine_bidir_rd( x264_t *h, x264_me_t *m0, x264_me_t *m1, int i_wei
 void x264_me_refine_bidir_satd( x264_t *h, x264_me_t *m0, x264_me_t *m1, int i_weight );
 uint64_t x264_rd_cost_part( x264_t *h, int i_lambda2, int i8, int i_pixel );
 
-extern uint16_t *x264_cost_mv_fpel[LAMBDA_MAX+1][4];
+extern uint16_t *x264_cost_mv_fpel[QP_MAX+1][4];
 
 #define COPY1_IF_LT(x,y)\
 if((y)<(x))\