--- encoder.c	2004/07/18 12:03:19	1.102.2.7
+++ encoder.c	2004/07/17 11:42:46	1.106
@@ -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.102.2.7 2004/07/18 12:03:19 edgomez Exp $
+ * $Id: encoder.c,v 1.106 2004/07/17 11:42:46 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -103,8 +103,7 @@
 	if (*base > 65535 || *inc > 65535) {
 		int *biggest;
 		int *other;
-		float div;
-
+		
 		if (*base > *inc) {
 			biggest = base;
 			other = inc;
@@ -113,7 +112,7 @@
 			other = base;
 		}
 		
-		div = ((float)*biggest)/((float)65535);
+		float div = ((float)*biggest)/((float)65535);
 		*biggest = (int)(((float)*biggest)/div);
 		*other = (int)(((float)*other)/div);
 	}
@@ -1868,7 +1867,7 @@
 #endif
 	if (current->sStat.kblks + current->sStat.mblks <=
 		(pParam->frame_drop_ratio * mb_width * mb_height) / 100 &&
-		pEnc->mbParam.max_bframes == 0)
+		( (pEnc->bframenum_head >= pEnc->bframenum_tail) || !(pEnc->mbParam.global_flags & XVID_GLOBAL_CLOSED_GOP)) )
 	{
 		current->sStat.kblks = current->sStat.mblks = 0;
 		current->sStat.ublks = mb_width * mb_height;