--- branches/dev-api-3/xvidcore/src/bitstream/mbcoding.c	2003/01/04 04:28:48	759
+++ branches/dev-api-3/xvidcore/src/bitstream/mbcoding.c	2003/01/04 06:14:33	760
@@ -52,6 +52,7 @@
 
 #include <stdlib.h>
 #include "../portab.h"
+#include "../global.h"
 #include "bitstream.h"
 #include "zigzag.h"
 #include "vlc_codes.h"
@@ -59,9 +60,6 @@
 
 #include "../utils/mbfunctions.h"
 
-#define ABS(X) (((X)>0)?(X):-(X))
-#define CLIP(X,A) (X > A) ? (A) : (X)
-
 VLC intra_table[4*2048*64];
 VLC inter_table[4*2048*64];
 
@@ -683,7 +681,7 @@
 
 	uint32_t index;
 	
-	index = CLIP(BitstreamShowBits(bs, 9), 256);
+	index = MIN(BitstreamShowBits(bs, 9), 256);
 
 	BitstreamSkip(bs, mcbpc_inter_table[index].len);