--- encoder.c	2002/09/30 14:16:02	1.76.2.8
+++ 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.8 2002/09/30 14:16:02 chl Exp $
+ *  $Id: encoder.c,v 1.76.2.11 2002/10/03 12:06:42 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -744,16 +744,26 @@
 	if (pEnc->bframenum_head > 0) {
 		pEnc->bframenum_head = pEnc->bframenum_tail = 0;
 
+		/* write an empty marker to the bitstream.
+		   
+		   for divx5 decoder compatibility, this marker must consist
+		   of a not-coded p-vop, with a time_base of zero, and time_increment 
+		   indentical to the future-referece frame.
+		*/
+
 		if ((pEnc->global & XVID_GLOBAL_PACKED)) {
+			int tmp;
 			
 			DPRINTF(DPRINTF_DEBUG,"*** EMPTY bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 
-			set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase);
-			BitstreamWriteVopHeader(&bs, &pEnc->mbParam, pEnc->current, 0);
 			BitstreamPad(&bs);
-			BitstreamPutBits(&bs, 0x7f, 8);
+
+			tmp = pEnc->current->seconds;
+			pEnc->current->seconds = 0; /* force time_base = 0 */
+			BitstreamWriteVopHeader(&bs, &pEnc->mbParam, pEnc->current, 0);
+			pEnc->current->seconds = tmp;
 
 			pFrame->length = BitstreamLength(&bs);
 			pFrame->intra = 0;
@@ -815,22 +825,20 @@
 		pEnc->queue_head =  (pEnc->queue_head + 1) % pEnc->mbParam.max_bframes;
 		pEnc->queue_size--;
 
-	} else if (BitstreamPos(&bs) == 0) {
+	} else {
 
-		DPRINTF(DPRINTF_DEBUG,"*** SKIP bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
-				pEnc->bframenum_head, pEnc->bframenum_tail,
-				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
+		/* if nothing was encoded, write an 'ignore this frame' flag
+		   to the bitstream */
 
-		pFrame->intra = 0;
+		if (BitstreamPos(&bs) == 0) {
 
-		set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase);
-		BitstreamWriteVopHeader(&bs, &pEnc->mbParam, pEnc->current, 0); // write N_VOP
-		BitstreamPad(&bs);
-		pFrame->length = BitstreamLength(&bs);
-		
-		return XVID_ERR_OK;
+			DPRINTF(DPRINTF_DEBUG,"*** SKIP bf: head=%i tail=%i   queue: head=%i tail=%i size=%i",
+				pEnc->bframenum_head, pEnc->bframenum_tail,
+				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 
-	} else {
+			BitstreamPutBits(&bs, 0x7f, 8);
+			pFrame->intra = 0;
+		}
 
 		pFrame->length = BitstreamLength(&bs);
 		return XVID_ERR_OK;
@@ -872,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);
 		}
 
 	/* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -963,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;
 		}
@@ -990,7 +998,7 @@
 		pEnc->flush_bframes = 1;
 
 		if ((pEnc->global & XVID_GLOBAL_PACKED)) {
-			BitstreamPad(&bs);
+			BitstreamPadAlways(&bs);
 			input_valid = 0;
 			goto ipvop_loop;
 		}
@@ -1605,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 {