--- branches/dev-api-4/xvidcore/src/motion/motion_est.c	2003/03/27 17:09:59	953
+++ branches/dev-api-4/xvidcore/src/motion/motion_est.c	2003/03/29 01:29:53	958
@@ -723,7 +723,7 @@
 		}
 	}
 
-	bits += cbpy_tab[15-(cbp>>2)].len;
+	bits += xvid_cbpy_tab[15-(cbp>>2)].len;
 	bits += mcbpc_inter_tab[(MODE_INTER & 7) | ((cbp & 3) << 3)].len;
 
 	if (bits < data->iMinSAD[0]) {
@@ -2675,7 +2675,7 @@
 				bits += CodeCoeffInter_CalcBits(coeff, scan_tables[0]);
 				cbp |= 1 << (5 - 5);
 			}
-			bits += cbpy_tab[15-(cbp>>2)].len;
+			bits += xvid_cbpy_tab[15-(cbp>>2)].len;
 			bits += mcbpc_inter_tab[(MODE_INTER4V & 7) | ((cbp & 3) << 3)].len;
 		}
 	}
@@ -2738,7 +2738,7 @@
 			bits += t = CodeCoeffIntra_CalcBits(coeff, scan_tables[0]) + dcc_tab[coeff[0] + 255].len;
 			if (t != 0) cbp |= 1 << (5 - 5);
 
-			bits += cbpy_tab[cbp>>2].len;
+			bits += xvid_cbpy_tab[cbp>>2].len;
 			bits += mcbpc_inter_tab[(MODE_INTRA & 7) | ((cbp & 3) << 3)].len;
 		}
 	}