--- trunk/xvidcore/src/encoder.c	2004/04/04 11:47:21	1406
+++ trunk/xvidcore/src/encoder.c	2004/12/05 13:01:27	1565
@@ -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.105 2004-04-04 11:47:21 syskin Exp $
+ * $Id: encoder.c,v 1.109 2004-12-05 13:01:27 syskin Exp $
  *
  ****************************************************************************/
 
@@ -100,11 +100,22 @@
 		i--;
 	}
 
-	/* if neccessary, round to 65535 accuracy */
-	if (*base > 65535) {
-		float div = (float) *base / 65535;
-		*base = (int) (*base / div);
-		*inc = (int) (*inc / div);
+	if (*base > 65535 || *inc > 65535) {
+		int *biggest;
+		int *other;
+		float div;
+
+		if (*base > *inc) {
+			biggest = base;
+			other = inc;
+		} else {
+			biggest = inc;
+			other = base;
+		}
+		
+		div = ((float)*biggest)/((float)65535);
+		*biggest = (int)(((float)*biggest)/div);
+		*other = (int)(((float)*other)/div);
 	}
 }
 
@@ -1686,7 +1697,6 @@
 								 pParam->height,
 								 pParam->edged_width,
 								 (current->vol_flags & XVID_VOL_QUARTERPEL),
-								 (current->vop_flags & XVID_VOP_REDUCED),
 								 current->rounding_type);
 
 			stop_comp_timer();
@@ -2006,7 +2016,7 @@
 			if (mb->mode == MODE_NOT_CODED) {
 				if (pEnc->mbParam.plugin_flags & XVID_REQORIGINAL) {
 					MBMotionCompensation(mb, x, y, f_ref, NULL, f_ref, NULL, NULL, &frame->image,
-											NULL, 0, 0, pEnc->mbParam.edged_width, 0, 0, 0);
+											NULL, 0, 0, pEnc->mbParam.edged_width, 0, 0);
 				}
 
 				continue;