--- trunk/xvidcore/src/motion/motion_est.c	2002/07/06 17:04:57	259
+++ trunk/xvidcore/src/motion/motion_est.c	2002/07/07 11:42:38	267
@@ -173,7 +173,7 @@
 
 	const VECTOR zeroMV = { 0, 0 };
 
-	long long time;
+	int64_t time;
 	int32_t x, y;
 	int32_t iIntra = 0;
 	VECTOR pmv;
@@ -2034,10 +2034,10 @@
 
 	backupMV = *currMV;			/* save best prediction, actually only for EXTSEARCH */
 
-	if (MotionFlags & PMV_USESQUARES8)
+	if (MotionFlags & PMV_USESQUARES16)
 		MainSearchPtr = Square16_MainSearch;
 	else
-	 if (MotionFlags & PMV_ADVANCEDDIAMOND8)
+	 if (MotionFlags & PMV_ADVANCEDDIAMOND16)
 		MainSearchPtr = AdvDiamond16_MainSearch;
 	else
 		MainSearchPtr = Diamond16_MainSearch;