--- trunk/xvidcore/src/encoder.c	2002/03/09 21:44:47	20
+++ trunk/xvidcore/src/encoder.c	2002/03/16 15:55:12	36
@@ -187,6 +187,7 @@
 	}
 
 	create_vlc_tables();
+	init_timer();
 
 	return XVID_ERR_OK;
 }
@@ -312,7 +313,7 @@
 	BitstreamPutBits(&bs, 0xFFFF, 16);
 	BitstreamPad(&bs);
 	pFrame->length = BitstreamLength(&bs);
-		
+
 	if (pResult)
 	{
 		pResult->quant = pEnc->mbParam.quant;
@@ -322,7 +323,7 @@
 		pResult->ublks = pEnc->sStat.ublks;
 	}
    
-	if (pEnc->bitrate)
+	if (pFrame->quant == 0)
 	{
 		RateControlUpdate(pEnc->mbParam.quant, pFrame->length, pFrame->intra);
 	}