--- encoder.c	2002/10/02 12:57:25	1.76.2.9
+++ encoder.c	2002/10/03 12:06:42	1.76.2.11
@@ -39,7 +39,7 @@
  *             MinChen <chenm001@163.com>
  *  14.04.2002 added FrameCodeB()
  *
- *  $Id: encoder.c,v 1.76.2.9 2002/10/02 12:57:25 suxen_drol Exp $
+ *  $Id: encoder.c,v 1.76.2.11 2002/10/03 12:06:42 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -880,7 +880,7 @@
 
 		if ((pEnc->global & XVID_GLOBAL_DEBUG)) {
 			image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 5, 
-				"%i  if:%i  st:%i:%i", pEnc->m_framenum++, pEnc->iFrameNum, pEnc->current->seconds, pEnc->current->ticks);
+				"%i  if:%i  st:%i", pEnc->m_framenum++, pEnc->iFrameNum, pEnc->current->stamp);
 		}
 
 	/* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -971,7 +971,7 @@
 		pEnc->flush_bframes = 1;
 
 		if ((pEnc->global & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail > 0) {
-			BitstreamPad(&bs);
+			BitstreamPadAlways(&bs);
 			input_valid = 0;
 			goto ipvop_loop;
 		}
@@ -998,7 +998,7 @@
 		pEnc->flush_bframes = 1;
 
 		if ((pEnc->global & XVID_GLOBAL_PACKED)) {
-			BitstreamPad(&bs);
+			BitstreamPadAlways(&bs);
 			input_valid = 0;
 			goto ipvop_loop;
 		}
@@ -1613,8 +1613,11 @@
 	start_timer();
 	if (pEnc->current->global_flags & XVID_HINTEDME_SET) {
 		HintedMESet(pEnc, &bIntra);
-		if (bIntra == 0) MotionEstimationHinted(&pEnc->mbParam, pEnc->current, pEnc->reference,
+	if (bIntra == 0) {
+			pEnc->current->fcode = FindFcode(&pEnc->mbParam, pEnc->current);
+			MotionEstimationHinted(&pEnc->mbParam, pEnc->current, pEnc->reference,
 											&pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV);
+		}
 
 	} else {