--- trunk/xvidcore/src/encoder.c	2005/12/09 04:45:35	1660
+++ trunk/xvidcore/src/encoder.c	2006/02/23 07:22:43	1680
@@ -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: encoder.c,v 1.121 2005-12-09 04:45:35 syskin Exp $
+ * $Id: encoder.c,v 1.125 2006-02-23 07:22:43 syskin Exp $
  *
  ****************************************************************************/
 
@@ -722,7 +722,7 @@
 		if ((pEnc->mbParam.plugin_flags & XVID_REQDQUANTS)) {
 			data.dquant = pEnc->temp_dquants;
 			data.dquant_stride = pEnc->mbParam.mb_width;
-			memset(data.dquant, 0, data.mb_width*data.mb_height);
+			memset(data.dquant, 0, data.mb_width*data.mb_height*sizeof(int));
 		}
 
 		if(pEnc->mbParam.plugin_flags & XVID_REQLAMBDA) {
@@ -1384,7 +1384,9 @@
 
 		if ( FrameCodeP(pEnc, &bs) == 0 ) {
 			/* N-VOP, we mustn't code b-frames yet */
-			call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, NULL, NULL, stats);
+			if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) || 
+				 pEnc->mbParam.max_bframes == 0)
+				call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, NULL, NULL, stats);
 			goto done;
 		}
 	}
@@ -1494,6 +1496,7 @@
 	BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1, pEnc->current->mbs[0].quant);
 
 	pEnc->current->sStat.iTextBits = 0;
+	pEnc->current->sStat.iMVBits = 0;
 	pEnc->current->sStat.kblks = mb_width * mb_height;
 	pEnc->current->sStat.mblks = pEnc->current->sStat.ublks = 0;
 
@@ -1592,8 +1595,8 @@
 	if ((current->vop_flags & XVID_VOP_HALFPEL)) {
 		if (reference->is_interpolated != current->rounding_type) {
 			start_timer();
-			image_interpolate(pRef, &pEnc->vInterH, &pEnc->vInterV,
-							  &pEnc->vInterHV, pParam->edged_width,
+			image_interpolate(pRef->y, pEnc->vInterH.y, pEnc->vInterV.y,
+							  pEnc->vInterHV.y, pParam->edged_width,
 							  pParam->edged_height,
 							  (pParam->vol_flags & XVID_VOL_QUARTERPEL),
 							  current->rounding_type);
@@ -1603,7 +1606,8 @@
 	}
 
 	current->sStat.iTextBits = current->sStat.iMvSum = current->sStat.iMvCount =
-		current->sStat.kblks = current->sStat.mblks = current->sStat.ublks = 0;
+		current->sStat.kblks = current->sStat.mblks = current->sStat.ublks = 
+		current->sStat.iMVBits = 0;
 
 	current->coding_type = P_VOP;
 
@@ -1795,7 +1799,7 @@
 		(pParam->frame_drop_ratio * mb_width * mb_height) / 100 &&
 		( (pEnc->bframenum_head >= pEnc->bframenum_tail) || !(pEnc->mbParam.global_flags & XVID_GLOBAL_CLOSED_GOP)) )
 	{
-		current->sStat.kblks = current->sStat.mblks = 0;
+		current->sStat.kblks = current->sStat.mblks = current->sStat.iTextBits = 0;
 		current->sStat.ublks = mb_width * mb_height;
 
 		BitstreamReset(bs);
@@ -1885,7 +1889,7 @@
 
 	if (pEnc->reference->is_interpolated != 0) {
 		start_timer();
-		image_interpolate(f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv,
+		image_interpolate(f_ref->y, pEnc->f_refh.y, pEnc->f_refv.y, pEnc->f_refhv.y,
 						  pEnc->mbParam.edged_width, pEnc->mbParam.edged_height,
 						  (pEnc->mbParam.vol_flags & XVID_VOL_QUARTERPEL), 0);
 		stop_inter_timer();
@@ -1902,7 +1906,7 @@
 
 	if (pEnc->current->is_interpolated != 0) {
 		start_timer();
-		image_interpolate(b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
+		image_interpolate(b_ref->y, pEnc->vInterH.y, pEnc->vInterV.y, pEnc->vInterHV.y,
 						pEnc->mbParam.edged_width, pEnc->mbParam.edged_height,
 						(pEnc->mbParam.vol_flags & XVID_VOL_QUARTERPEL), 0);
 		stop_inter_timer();
@@ -1926,6 +1930,7 @@
 	BitstreamWriteVopHeader(bs, &pEnc->mbParam, frame, 1, frame->quant);
 
 	frame->sStat.iTextBits = 0;
+	frame->sStat.iMVBits = 0;
 	frame->sStat.iMvSum = 0;
 	frame->sStat.iMvCount = 0;
 	frame->sStat.kblks = frame->sStat.mblks = frame->sStat.ublks = 0;