--- encoder.c	2003/08/02 15:08:19	1.95.2.36
+++ encoder.c	2003/08/07 15:41:33	1.95.2.38
@@ -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.36 2003/08/02 15:08:19 edgomez Exp $
+ * $Id: encoder.c,v 1.95.2.38 2003/08/07 15:41:33 chl Exp $
  *
  ****************************************************************************/
 
@@ -115,7 +115,7 @@
 enc_create(xvid_enc_create_t * create)
 {
 	Encoder *pEnc;
-    int n;
+  int n;
 
 	if (XVID_VERSION_MAJOR(create->version) != 1) /* v1.x.x */
 		return XVID_ERR_VERSION;
@@ -226,8 +226,7 @@
 	pEnc->mbParam.frame_drop_ratio = MAX(create->frame_drop_ratio, 0);
 
     /* max keyframe interval */
-    pEnc->mbParam.iMaxKeyInterval = create->max_key_interval <= 0 ?
-		(10 * pEnc->mbParam.fbase) / pEnc->mbParam.fincr : create->max_key_interval;
+    pEnc->mbParam.iMaxKeyInterval = create->max_key_interval <= 0 ? (10 * (int)pEnc->mbParam.fbase) / (int)pEnc->mbParam.fincr : create->max_key_interval;
 
     /* allocate working frame-image memory */
 
@@ -771,7 +770,7 @@
     }
 
     /* call plugins */
-    for (i=0; i<pEnc->num_plugins;i++) {
+    for (i=0; i<(unsigned int)pEnc->num_plugins;i++) {
         emms();
         if (pEnc->plugins[i].func) {
             if (pEnc->plugins[i].func(pEnc->plugins[i].param, opt, &data, 0) < 0) {
@@ -1253,7 +1252,7 @@
 	 * on next enc_encode call we must flush bframes
 	 * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */
 
-done_flush:
+/*done_flush:*/
 
     pEnc->flush_bframes = 1;
 
@@ -1285,6 +1284,10 @@
 {
     unsigned int i,j;
     int quant = frame->quant;
+    if (quant > 31)
+		frame->quant = quant = 31;
+	else if (quant < 1)
+		frame->quant = quant = 1;
 
     for (j=0; j<pParam->mb_height; j++)
     for (i=0; i<pParam->mb_width; i++) {
@@ -1292,7 +1295,7 @@
         quant += pMB->dquant;
         if (quant > 31)
 			quant = 31;
-		if (quant < 1)
+		else if (quant < 1)
 			quant = 1;
         pMB->quant = quant;
     }