--- encoder.c	2003/04/08 11:04:06	1.98
+++ encoder.c	2003/07/28 12:36:20	1.101
@@ -26,7 +26,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.98 2003/04/08 11:04:06 syskin Exp $
+ *  $Id: encoder.c,v 1.101 2003/07/28 12:36:20 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -183,7 +183,7 @@
 	/* 1 keyframe each 10 seconds */
 
 	if (pParam->max_key_interval <= 0)
-		pParam->max_key_interval = 10 * pParam->fincr / pParam->fbase;
+		pParam->max_key_interval = 10 * pParam->fbase / pParam->fincr;
 
 	pEnc = (Encoder *) xvid_malloc(sizeof(Encoder), CACHE_LINE);
 	if (pEnc == NULL)
@@ -1016,7 +1016,7 @@
 		mode = MEanalysis(&pEnc->reference->image, pEnc->current,
 					&pEnc->mbParam, pEnc->mbParam.iMaxKeyInterval,
 					(/*mode < 0*/1/*hack*/) ? pEnc->iFrameNum : 0,
-					bframes_count++, 0 /*pFrame->bframe_threshold*/);
+					bframes_count++, pFrame->bframe_threshold);
 	}
 
 	if (mode == I_VOP) {
@@ -1638,7 +1638,7 @@
 
 	set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase);
 
-	BitstreamPadAlways(bs);
+	BitstreamPad(bs);
 	BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1);
 
 	*pBits = BitstreamPos(bs);
@@ -1785,7 +1785,7 @@
 	set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase);
 	if (vol_header)
 	{	BitstreamWriteVolHeader(bs, &pEnc->mbParam, pEnc->current);
-		BitstreamPadAlways(bs);
+		BitstreamPad(bs);
 	}
 
 	BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1);