--- mbprediction.c	2003/02/22 08:49:45	1.13.2.1
+++ mbprediction.c	2003/03/26 14:56:49	1.13.2.3
@@ -438,11 +438,12 @@
 {
 
 	int32_t j;
-	int32_t iDcScaler, iQuant = frame->quant;
+	int32_t iDcScaler, iQuant;
 	int S = 0;
 	int16_t predictors[6][8];
 
 	MACROBLOCK *pMB = &frame->mbs[x + y * mb_width];
+    iQuant = pMB->quant;
 
 	if ((pMB->mode == MODE_INTRA) || (pMB->mode == MODE_INTRA_Q)) {
 
@@ -452,7 +453,7 @@
 			predict_acdc(frame->mbs, x, y, mb_width, j, &qcoeff[j * 64],
 						 iQuant, iDcScaler, predictors[j], 0);
 
-			if ((frame->vop_flags & XVID_HQACPRED))
+			if ((frame->vop_flags & XVID_VOP_HQACPRED))
 				S += calc_acdc_bits(pMB, j, &qcoeff[j * 64], iDcScaler, predictors[j]);
 			else
 				S += calc_acdc_coeff(pMB, j, &qcoeff[j * 64], iDcScaler, predictors[j]);