--- encoder.c	2002/09/04 21:43:46	1.79
+++ encoder.c	2002/09/12 18:53:35	1.83
@@ -28,7 +28,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.79 2002/09/04 21:43:46 edgomez Exp $
+ * $Id: encoder.c,v 1.83 2002/09/12 18:53:35 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -102,8 +102,8 @@
  * Encoder creation
  *
  * This function creates an Encoder instance, it allocates all necessary
- * image buffers (reference, current and bframes) and initialize the internal
- * xvid encoder paremeters according to the XVID_ENC_PARAM input parameter.
+ * image buffers (reference, current) and initialize the internal xvid
+ * encoder paremeters according to the XVID_ENC_PARAM input parameter.
  *
  * The code seems to be very long but is very basic, mainly memory allocation
  * and cleaning code.
@@ -560,7 +560,7 @@
 	emms();
 
 	if (pFrame->quant == 0) {
-		RateControlUpdate(&pEnc->rate_control, pEnc->current->quant,
+		RateControlUpdate(&pEnc->rate_control, (int16_t)pEnc->current->quant,
 						  pFrame->length, pFrame->intra);
 	}
 #ifdef _DEBUG_PSNR
@@ -889,7 +889,7 @@
 	DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE);
 
 	int iLimit;
-	int x, y, k;
+	unsigned int x, y;
 	int iSearchRange;
 	int bIntra;
 	
@@ -1000,11 +1000,11 @@
 				CodeIntraMB(pEnc, pMB);
 				MBTransQuantIntra(&pEnc->mbParam, pEnc->current, pMB, x, y,
 								  dct_codes, qcoeff);
-			}
 
-			start_timer();
-			MBPrediction(pEnc->current, x, y, pEnc->mbParam.mb_width, qcoeff);
-			stop_prediction_timer();
+				start_timer();
+				MBPrediction(pEnc->current, x, y, pEnc->mbParam.mb_width, qcoeff);
+				stop_prediction_timer();
+			}
 
 			if (pMB->mode == MODE_INTRA || pMB->mode == MODE_INTRA_Q) {
 				pEnc->sStat.kblks++;