--- mbcoding.c	2002/03/09 15:29:26	1.2
+++ mbcoding.c	2002/03/15 09:20:03	1.4
@@ -5,6 +5,8 @@
 
 #include "../utils/mbfunctions.h"
 
+#include <stdlib.h> /* malloc, free */
+
 #define ESCAPE 7167
 #define ABS(X) (((X)>0)?(X):-(X))
 #define CLIP(X,A) (X > A) ? (A) : (X)
@@ -98,9 +100,10 @@
 							level += max_level_ptr[run];
 						else
 							level -= max_level_ptr[run];
-							
+						DEBUG1("1) run:", run);
 						run -= max_run_ptr[abs(level)] + 1;
-							
+						DEBUG1("2) run:", run);
+						
 						if(abs(level) <= max_level_ptr[run] &&
 							run <= max_run_ptr[abs(level)]) {
 						
@@ -124,6 +127,8 @@
 							else
 								run++;
 
+							DEBUG1("3) run:", run);
+
 							vlc[intra]->code = (uint32_t) ((0x1e + last) << 20) |
 										(l << 14) | (1 << 13) | ((k & 0xfff) << 1) | 1;
 								
@@ -263,14 +268,17 @@
 {
 	uint32_t i, mcbpc, cbpy, bits;
 
-	mcbpc = pMB->cbp & 3;
 	cbpy = pMB->cbp >> 2;
 
     // write mcbpc
-	if(pParam->coding_type == I_VOP)
-		BitstreamPutBits(bs, mcbpc_I[mcbpc].code, mcbpc_I[mcbpc].len);
-    else
-		BitstreamPutBits(bs, mcbpc_P_intra[mcbpc].code, mcbpc_P_intra[mcbpc].len);
+	if(pParam->coding_type == I_VOP) {
+	    mcbpc = ((pMB->mode >> 1) & 3) | ((pMB->cbp & 3) << 2);
+		BitstreamPutBits(bs, mcbpc_intra_tab[mcbpc].code, mcbpc_intra_tab[mcbpc].len);
+	}
+	else {
+	    mcbpc = (pMB->mode & 7) | ((pMB->cbp & 3) << 3);
+		BitstreamPutBits(bs, mcbpc_inter_tab[mcbpc].code, mcbpc_inter_tab[mcbpc].len);
+	}
 
 	// ac prediction flag
 	if(pMB->acpred_directions[0])
@@ -314,14 +322,11 @@
 	int32_t i;
 	uint32_t bits, mcbpc, cbpy;
 
-	mcbpc = pMB->cbp & 3;
+    mcbpc = (pMB->mode & 7) | ((pMB->cbp & 3) << 3);
 	cbpy = 15 - (pMB->cbp >> 2);
 
 	// write mcbpc
-    if(pMB->mode == MODE_INTER4V)
-		BitstreamPutBits(bs, mcbpc_P_inter4v[mcbpc].code, mcbpc_P_inter4v[mcbpc].len);
-    else
-		BitstreamPutBits(bs, mcbpc_P_inter[mcbpc].code, mcbpc_P_inter[mcbpc].len);
+    BitstreamPutBits(bs, mcbpc_inter_tab[mcbpc].code, mcbpc_inter_tab[mcbpc].len);
 
 	// write cbpy
 	BitstreamPutBits(bs, cbpy_tab[cbpy].code, cbpy_tab[cbpy].len);