--- trunk/xvidcore/src/divx4.c	2002/06/24 09:53:18	238
+++ trunk/xvidcore/src/divx4.c	2003/02/15 15:22:19	851
@@ -38,7 +38,7 @@
  *  22.12.2001  removed some compiler warnings
  *  16.12.2001  inital version; (c)2001 peter ross <pross@cs.rmit.edu.au>
  *
- *  $Id: divx4.c,v 1.15 2002-06-24 09:53:17 suxen_drol Exp $
+ *  $Id: divx4.c,v 1.21 2003-02-15 15:22:17 edgomez Exp $
  *
  *************************************************************************/
 
@@ -106,20 +106,17 @@
 static int const divx4_motion_presets[7] = {
 	0,
 
-	PMV_EARLYSTOP16,
+	0,
 
-	PMV_EARLYSTOP16 | PMV_ADVANCEDDIAMOND16,
+	PMV_ADVANCEDDIAMOND16,
 
-	PMV_EARLYSTOP16 | PMV_HALFPELREFINE16,
+	PMV_HALFPELREFINE16,
 
-	PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EARLYSTOP8 |
-		PMV_HALFPELREFINE8,
+	PMV_HALFPELREFINE16 | PMV_HALFPELREFINE8,
 
-	PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EARLYSTOP8 |
-		PMV_HALFPELREFINE8,
+	PMV_HALFPELREFINE16 | PMV_HALFPELREFINE8,
 
-	PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EXTSEARCH16 | PMV_EARLYSTOP8 |
-		PMV_HALFPELREFINE8
+	PMV_HALFPELREFINE16 | PMV_EXTSEARCH16 |	PMV_HALFPELREFINE8
 };
 
 
@@ -287,7 +284,7 @@
 			}
 
 			/* Decode the bitstream */
-			xerr = decoder_decode(dcur->handle, &dcur->xframe);
+			xerr = decoder_decode(dcur->handle, &dcur->xframe, NULL);
 
 			/* Restore the real colorspace for this instance */
 			if (!dframe->render_flag) {
@@ -370,11 +367,10 @@
 			xparam.max_quantizer = eparam->max_quantizer;
 			xparam.max_key_interval = eparam->max_key_interval;
 
-#ifdef BFRAMES
 			xparam.global = 0;
 			xparam.max_bframes = -1;	/* use "original" IP-frame encoder */
 			xparam.bquant_ratio = 200;
-#endif
+			xparam.frame_drop_ratio = 0;	/* dont drop frames */
 
 			/* Create the encoder session */
 			xerr = encoder_create(&xparam);