--- mbcoding.c	2003/02/21 08:32:34	1.44
+++ mbcoding.c	2003/04/10 13:05:54	1.44.2.5
@@ -498,7 +498,7 @@
 	{
 		if ((level = qcoeff[zigzag[i++]]) != 0)
 		{
-			abs_level = ABS(prev_level);
+			abs_level = abs(prev_level);
 			abs_level = abs_level < 64 ? abs_level : 0;
 			code	  = coeff_VLC[1][0][abs_level][prev_run].code;
 			len		  = coeff_VLC[1][0][abs_level][prev_run].len;
@@ -518,7 +518,7 @@
 			run++;
 	}
 
-	abs_level = ABS(prev_level);
+	abs_level = abs(prev_level);
 	abs_level = abs_level < 64 ? abs_level : 0;
 	code	  = coeff_VLC[1][1][abs_level][prev_run].code;
 	len		  = coeff_VLC[1][1][abs_level][prev_run].len;
@@ -559,7 +559,7 @@
 	{
 		if ((level = qcoeff[zigzag[i++]]) != 0)
 		{
-			abs_level = ABS(prev_level);
+			abs_level = abs(prev_level);
 			abs_level = abs_level < 64 ? abs_level : 0;
 			len		  = coeff_VLC[1][0][abs_level][prev_run].len;
 			bits      += len!=128 ? len : 30;
@@ -572,7 +572,7 @@
 			run++;
 	}
 
-	abs_level = ABS(prev_level);
+	abs_level = abs(prev_level);
 	abs_level = abs_level < 64 ? abs_level : 0;
 	len		  = coeff_VLC[1][1][abs_level][prev_run].len;
 	bits      += len!=128 ? len : 30;
@@ -627,6 +627,13 @@
 
 #endif
 
+
+static int iDQtab[5] = {
+	1, 0, -1 /* no change */, 2, 3
+};
+#define DQ_VALUE2INDEX(value)  iDQtab[(value)+2]
+
+
 static __inline void
 CodeBlockIntra(const FRAMEINFO * const frame,
 			   const MACROBLOCK * pMB,
@@ -657,14 +664,14 @@
 		BitstreamPutBits(bs, 0, 1);
 
 	// write cbpy
-	BitstreamPutBits(bs, cbpy_tab[cbpy].code, cbpy_tab[cbpy].len);
+	BitstreamPutBits(bs, xvid_cbpy_tab[cbpy].code, xvid_cbpy_tab[cbpy].len);
 
 	// write dquant
 	if (pMB->mode == MODE_INTRA_Q)
-		BitstreamPutBits(bs, pMB->dquant, 2);
+		BitstreamPutBits(bs, DQ_VALUE2INDEX(pMB->dquant), 2);
 
 	// write interlacing
-	if (frame->global_flags & XVID_INTERLACING) {
+	if (frame->vol_flags & XVID_VOL_INTERLACING) {
 		BitstreamPutBit(bs, pMB->field_dct);
 	}
 	// code block coeffs
@@ -678,7 +685,7 @@
 
 		if (pMB->cbp & (1 << (5 - i))) {
 			const uint16_t *scan_table =
-				frame->global_flags & XVID_ALTERNATESCAN ?
+				frame->vop_flags & XVID_VOP_ALTERNATESCAN ?
 				scan_tables[2] : scan_tables[pMB->acpred_directions[i]];
 
 			bits = BitstreamPos(bs);
@@ -719,14 +726,14 @@
 		BitstreamPutBit(bs, pMB->mcsel);		// mcsel: '0'=local motion, '1'=GMC
 
 	// write cbpy
-	BitstreamPutBits(bs, cbpy_tab[cbpy].code, cbpy_tab[cbpy].len);
+	BitstreamPutBits(bs, xvid_cbpy_tab[cbpy].code, xvid_cbpy_tab[cbpy].len);
 
 	// write dquant
 	if (pMB->mode == MODE_INTER_Q)
-		BitstreamPutBits(bs, pMB->dquant, 2);
+		BitstreamPutBits(bs, DQ_VALUE2INDEX(pMB->dquant), 2);
 
 	// interlacing
-	if (frame->global_flags & XVID_INTERLACING) {
+	if (frame->vol_flags & XVID_VOL_INTERLACING) {
 		if (pMB->cbp) {
 			BitstreamPutBit(bs, pMB->field_dct);
 			DPRINTF(DPRINTF_MB,"codep: field_dct: %i", pMB->field_dct);
@@ -758,7 +765,7 @@
 		if (pMB->cbp & (1 << (5 - i)))
 		{
 			const uint16_t *scan_table =
-				frame->global_flags & XVID_ALTERNATESCAN ?
+				frame->vop_flags & XVID_VOP_ALTERNATESCAN ?
 				scan_tables[2] : scan_tables[0];
 
 #ifdef BIGLUT
@@ -1052,7 +1059,7 @@
 		return data;
 
 	res = BitstreamGetBits(bs, fcode - 1);
-	mv = ((ABS(data) - 1) * scale_fac) + res + 1;
+	mv = ((abs(data) - 1) * scale_fac) + res + 1;
 
 	return data < 0 ? -mv : mv;
 
@@ -1618,7 +1625,7 @@
 	{5, 6}, {5, 9}, {5, 8}, {3, 7}, {2, 9}
 };
 
-const VLC cbpy_tab[16] = {
+const VLC xvid_cbpy_tab[16] = {
 	{3, 4}, {5, 5}, {4, 5}, {9, 4}, {3, 5}, {7, 4}, {2, 6}, {11, 4},
 	{2, 5}, {3, 6}, {5, 4}, {10, 4}, {4, 4}, {8, 4}, {6, 4}, {3, 2}
 };