--- 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/09 22:03:13	1011
@@ -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;
@@ -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;
 
@@ -1267,6 +1269,7 @@
 
 }
 
+
 /*****************************************************************************
  * VLC tables and other constant arrays
  ****************************************************************************/