--- global.h	2003/01/11 14:59:23	1.13.2.8
+++ global.h	2003/02/09 06:33:51	1.13.2.10
@@ -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;
 
@@ -156,7 +160,7 @@
 }
 MACROBLOCK;
 
-static __inline int8_t
+static __inline uint32_t
 get_dc_scaler(uint32_t quant,
 			  uint32_t lum)
 {