--- global.h	2003/10/01 23:23:00	1.21.2.10
+++ global.h	2010/09/13 07:38:09	1.26
@@ -19,7 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: global.h,v 1.21.2.10 2003/10/01 23:23:00 edgomez Exp $
+ * $Id: global.h,v 1.26 2010/09/13 07:38:09 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -48,7 +48,6 @@
 #define MODE_DIRECT_NONE_MV	4
 #define MODE_DIRECT_NO4V	5
 
-
 /*
  * vop coding types
  * intra, prediction, backward, sprite, not_coded
@@ -73,7 +72,6 @@
 	return xvid_type - 1;
 }
 
-
 typedef struct
 {
 	int x;
@@ -81,8 +79,6 @@
 }
 VECTOR;
 
-
-
 typedef struct
 {
 	VECTOR duv[3];
@@ -168,7 +164,6 @@
 }
 IMAGE;
 
-
 typedef struct
 {
 	uint32_t bufa;
@@ -182,10 +177,8 @@
 }
 Bitstream;
 
-
 #define MBPRED_SIZE  15
 
-
 typedef struct
 {
 	/* decoder/encoder */
@@ -204,7 +197,6 @@
 
 	/* encoder specific */
 
-	VECTOR mv16;
 	VECTOR pmvs[4];
 	VECTOR qmvs[4];				/* mvs in quarter pixel resolution */
 
@@ -214,20 +206,18 @@
 	int dquant;
 	int cbp;
 
+	/* lambda for these blocks */
+	int lambda[6];
+
 	/* bframe stuff */
 
 	VECTOR b_mvs[4];
 	VECTOR b_qmvs[4];
 
-	int mb_type;
-
-	/*
-	 * stuff for block based ME (needed for Qpel ME)
-	 * backup of last integer ME vectors/sad
-	 */
-
 	VECTOR amv; /* average motion vectors from GMC  */
 	int32_t mcsel;
+	
+	VECTOR  mvs_avg;      //CK average of field motion vectors
 
 /* This structure has become way to big! What to do? Split it up?   */