--- encoder.c	2003/10/01 23:23:00	1.95.2.42
+++ encoder.c	2003/10/07 13:02:35	1.95.2.45
@@ -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.95.2.42 2003/10/01 23:23:00 edgomez Exp $
+ * $Id: encoder.c,v 1.95.2.45 2003/10/07 13:02:35 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -1082,7 +1082,7 @@
 
 	if ((pEnc->current->vop_flags & XVID_VOP_DEBUG)) {
 		image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 5,
-			"%i  st:%i  if:%i", pEnc->current->frame_num, pEnc->current->stamp, pEnc->iFrameNum);
+			"%d  st:%lld  if:%d", pEnc->current->frame_num, pEnc->current->stamp, pEnc->iFrameNum);
 	}
 
 	/* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1872,7 +1872,6 @@
 	for (y = 0; y < pEnc->mbParam.mb_height; y++) {
 		for (x = 0; x < pEnc->mbParam.mb_width; x++) {
 			MACROBLOCK * const mb = &frame->mbs[x + y * pEnc->mbParam.mb_width];
-			int direction = frame->vop_flags & XVID_VOP_ALTERNATESCAN ? 2 : 0;
 
 			/* decoder ignores mb when refence block is INTER(0,0), CBP=0 */
 			if (mb->mode == MODE_NOT_CODED) {
@@ -1906,8 +1905,8 @@
 				mb->cbp &= 0x3C;
 
 			start_timer();
-			MBCodingBVOP(mb, qcoeff, frame->fcode, frame->bcode, bs,
-						 &frame->sStat, direction);
+			MBCodingBVOP(frame, mb, qcoeff, frame->fcode, frame->bcode, bs,
+						 &frame->sStat);
 			stop_coding_timer();
 		}
 	}