--- encoder.c	2004/07/17 11:41:41	1.102.2.6
+++ encoder.c	2004/04/04 11:47:21	1.105
@@ -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.6 2004/07/17 11:41:41 edgomez Exp $
+ * $Id: encoder.c,v 1.105 2004/04/04 11:47:21 syskin Exp $
  *
  ****************************************************************************/
 
@@ -100,21 +100,11 @@
 		i--;
 	}
 
-	if (*base > 65535 || *inc > 65535) {
-		int *biggest;
-		int *other;
-		
-		if (*base > *inc) {
-			biggest = base;
-			other = inc;
-		} else {
-			biggest = inc;
-			other = base;
-		}
-		
-		float div = ((float)*biggest)/((float)65535);
-		*biggest = (int)(((float)*biggest)/div);
-		*other = (int)(((float)*other)/div);
+	/* if neccessary, round to 65535 accuracy */
+	if (*base > 65535) {
+		float div = (float) *base / 65535;
+		*base = (int) (*base / div);
+		*inc = (int) (*inc / div);
 	}
 }
 
@@ -1867,7 +1857,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;