--- estimation_bvop.c	2004/12/08 12:43:48	1.18
+++ estimation_bvop.c	2004/12/09 04:58:12	1.20
@@ -21,7 +21,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: estimation_bvop.c,v 1.18 2004/12/08 12:43:48 syskin Exp $
+ * $Id: estimation_bvop.c,v 1.20 2004/12/09 04:58:12 syskin Exp $
  *
  ****************************************************************************/
 
@@ -829,6 +829,7 @@
 
 	pMB->sad16 = best_sad;
 	pMB->mode = mode;
+	pMB->cbp = 63;
 
 	switch (mode) {
 
@@ -985,6 +986,7 @@
 	Data_d.rounding = 0;
 	Data_d.chroma = frame->motion_flags & XVID_ME_CHROMA_BVOP;
 	Data_d.iQuant = frame->quant;
+	Data_d.quant_sq = frame->quant*frame->quant;
 	Data_d.dctSpace = dct_space;
 	Data_d.quant_type = !(pParam->vol_flags & XVID_VOL_MPEGQUANT);
 	Data_d.mpeg_quant_matrices = pParam->mpeg_quant_matrices;
@@ -1028,6 +1030,7 @@
 
 			if (pMB->mode == MODE_DIRECT_NONE_MV) {
 				pMB->sad16 = best_sad;
+				pMB->cbp = 0;
 				continue;
 			}
 
@@ -1066,6 +1069,7 @@
 				
 				if (pMB->mode == MODE_DIRECT_NONE_MV) { /* skipped? */
 					pMB->sad16 = skip_sad;
+					pMB->cbp = 0;
 					continue;
 				}
 			}