--- branches/dev-api-4/xvidcore/src/bitstream/mbcoding.c	2003/03/29 01:29:53	958
+++ branches/dev-api-4/xvidcore/src/bitstream/mbcoding.c	2003/05/22 16:36:07	1038
@@ -51,6 +51,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include "../portab.h"
 #include "../global.h"
 #include "bitstream.h"
@@ -498,7 +500,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 +520,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 +561,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 +574,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;
@@ -736,13 +738,13 @@
 	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);
+			DPRINTF(XVID_DEBUG_MB,"codep: field_dct: %i\n", pMB->field_dct);
 		}
 
 		// if inter block, write field ME flag
 		if (pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q) {
 			BitstreamPutBit(bs, pMB->field_pred);
-			DPRINTF(DPRINTF_MB,"codep: field_pred: %i", pMB->field_pred);
+			DPRINTF(XVID_DEBUG_MB,"codep: field_pred: %i\n", pMB->field_pred);
 
 			// write field prediction references
 			if (pMB->field_pred) {
@@ -1059,7 +1061,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;
 
@@ -1160,7 +1162,7 @@
 		level = BitstreamGetBits(bs, 8);
 
 		if (level == 0 || level == 128)
-			DPRINTF(DPRINTF_ERROR, "Illegal LEVEL for ESCAPE mode 4: %d", level);
+			DPRINTF(XVID_DEBUG_ERROR, "Illegal LEVEL for ESCAPE mode 4: %d\n", level);
 
 		return (level << 24) >> 24;
 	}
@@ -1216,17 +1218,17 @@
 	do {
 		level = get_coeff(bs, &run, &last, 1, 0);
 		if (run == -1) {
-			DPRINTF(DPRINTF_ERROR,"fatal: invalid run");
+			DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run");
 			break;
 		}
 		coeff += run;
 		block[scan[coeff]] = level;
 
-		DPRINTF(DPRINTF_COEFF,"block[%i] %i", scan[coeff], level);
-		//DPRINTF(DPRINTF_COEFF,"block[%i] %i %08x", scan[coeff], level, BitstreamShowBits(bs, 32));
+		DPRINTF(XVID_DEBUG_COEFF,"block[%i] %i\n", scan[coeff], level);
+		//DPRINTF(XVID_DEBUG_COEFF,"block[%i] %i %08x\n", scan[coeff], level, BitstreamShowBits(bs, 32));
 
 		if (level < -2047 || level > 2047) {
-			DPRINTF(DPRINTF_ERROR,"warning: intra_overflow %i", level);
+			DPRINTF(XVID_DEBUG_ERROR,"warning: intra_overflow %i\n", level);
 		}
 		coeff++;
 	} while (!last);
@@ -1249,24 +1251,25 @@
 	do {
 		level = get_coeff(bs, &run, &last, 0, 0);
 		if (run == -1) {
-			DPRINTF(DPRINTF_ERROR,"fatal: invalid run");
+			DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run");
 			break;
 		}
 		p += run;
 
 		block[scan[p]] = level;
 
-		DPRINTF(DPRINTF_COEFF,"block[%i] %i", scan[p], level);
-		// DPRINTF(DPRINTF_COEFF,"block[%i] %i %08x", scan[p], level, BitstreamShowBits(bs, 32));
+		DPRINTF(XVID_DEBUG_COEFF,"block[%i] %i\n", scan[p], level);
+		// DPRINTF(XVID_DEBUG_COEFF,"block[%i] %i %08x\n", scan[p], level, BitstreamShowBits(bs, 32));
 
 		if (level < -2047 || level > 2047) {
-			DPRINTF(DPRINTF_ERROR,"warning: inter overflow %i", level);
+			DPRINTF(XVID_DEBUG_ERROR,"warning: inter overflow %i\n", level);
 		}
 		p++;
 	} while (!last);
 
 }
 
+
 /*****************************************************************************
  * VLC tables and other constant arrays
  ****************************************************************************/