--- global.h	2003/01/11 14:59:23	1.13.2.8
+++ global.h	2003/04/04 22:16:15	1.22
@@ -56,18 +56,22 @@
 	int j0s;
 	int i1s;
 	int j1s;
-//	int i2s;
-//	int j2s;
+	int i2s;
+	int j2s;
 	
 	int i1ss; 
 	int j1ss; 
-//	int i2ss; 
-//	int j2ss; 
+	int i2ss; 
+	int j2ss; 
 
 	int alpha;
-//	int beta;
+	int beta;
 	int Ws; 
-//	int Hs; 
+	int Hs; 
+	
+	int dxF, dyF, dxG, dyG; 
+	int Fo, Go;
+	int cFo, cGo;
 }
 GMC_DATA;
 
@@ -90,6 +94,7 @@
 	uint32_t *tail;
 	uint32_t *start;
 	uint32_t length;
+	uint32_t initpos;
 }
 Bitstream;
 
@@ -129,25 +134,12 @@
 
 	VECTOR b_mvs[4];
 	VECTOR b_qmvs[4];
-//	VECTOR b_pmvs[1];
-
-	// bframe direct mode
-
-//	VECTOR directmv[4];
-//	VECTOR deltamv;
 
 	int mb_type;
-	int dbquant;
 
 	// stuff for block based ME (needed for Qpel ME)
 	// backup of last integer ME vectors/sad
 
-//	VECTOR i_mv16;
-	VECTOR i_mvs[4];
-
-	int32_t i_sad8[4];	// SAD values for inter4v-VECTORs
-//	int32_t i_sad16;	// SAD value for inter-VECTOR
-
 	VECTOR amv; // average motion vectors from GMC 
 	int32_t mcsel;
 
@@ -156,7 +148,7 @@
 }
 MACROBLOCK;
 
-static __inline int8_t
+static __inline uint32_t
 get_dc_scaler(uint32_t quant,
 			  uint32_t lum)
 {