--- global.h	2003/01/31 22:25:18	1.13.2.9
+++ global.h	2003/04/04 22:16:15	1.22
@@ -94,6 +94,7 @@
 	uint32_t *tail;
 	uint32_t *start;
 	uint32_t length;
+	uint32_t initpos;
 }
 Bitstream;
 
@@ -133,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;
 
@@ -160,7 +148,7 @@
 }
 MACROBLOCK;
 
-static __inline int8_t
+static __inline uint32_t
 get_dc_scaler(uint32_t quant,
 			  uint32_t lum)
 {