--- trunk/xvidcore/src/motion/motion_est.c	2002/07/10 19:16:32	284
+++ trunk/xvidcore/src/motion/motion_est.c	2002/07/10 19:16:56	285
@@ -1149,8 +1149,8 @@
 	}
 
 	/* because we might use something like IF (dx>max_dx) THEN dx=max_dx; */
-	bPredEq = get_pmvdata(pMBs, x, y, iWcount, 0, pmv, psad);
-	// bPredEq = get_pmvdata2(pMBs, iWcount, 0, x, y, 0, pmv, psad);
+	//bPredEq = get_pmvdata(pMBs, x, y, iWcount, 0, pmv, psad);
+	bPredEq = get_pmvdata2(pMBs, iWcount, 0, x, y, 0, pmv, psad);
 
 /*	fprintf(stderr,"pmv: %d %d / %d --- %d %d   %d %d   %d %d - %d %d %d\n",
 		pmv[0].x,pmv[0].y,psad[0],
@@ -1577,8 +1577,8 @@
 	}
 
 	/* because we might use IF (dx>max_dx) THEN dx=max_dx; */
-	bPredEq = get_pmvdata(pMBs, (x >> 1), (y >> 1), iWcount, iSubBlock, pmv, psad);
-	// bPredEq = get_pmvdata2(pMBs, iWcount, 0, (x >> 1), (y >> 1), iSubBlock, pmv, psad);
+	//bPredEq = get_pmvdata(pMBs, (x >> 1), (y >> 1), iWcount, iSubBlock, pmv, psad);
+	bPredEq = get_pmvdata2(pMBs, iWcount, 0, (x >> 1), (y >> 1), iSubBlock, pmv, psad);
 
 	if ((x == 0) && (y == 0)) {
 		threshA = 512 / 4;
@@ -1888,8 +1888,8 @@
 		max_dy = EVEN(max_dy);
 	}
 	/* because we might use something like IF (dx>max_dx) THEN dx=max_dx; */
-	bPredEq = get_pmvdata(pMBs, x, y, iWcount, 0, pmv, psad);
-	// bPredEq = get_pmvdata2(pMBs, iWcount, 0, x, y, 0, pmv, psad);
+	//bPredEq = get_pmvdata(pMBs, x, y, iWcount, 0, pmv, psad);
+	bPredEq = get_pmvdata2(pMBs, iWcount, 0, x, y, 0, pmv, psad);
 
 /* Step 4: Calculate SAD around the Median prediction. 
         MinSAD=SAD 
@@ -2167,8 +2167,8 @@
 		max_dy = EVEN(max_dy);
 	}
 	/* because we might use something like IF (dx>max_dx) THEN dx=max_dx; */
-	bPredEq = get_pmvdata(pMBs, x >> 1, y >> 1, iWcount, iSubBlock, pmv, psad);
-	// bPredEq = get_pmvdata2(pMBs, iWcount, 0, x >> 1, y >> 1, iSubBlock, pmv, psad);
+	//bPredEq = get_pmvdata(pMBs, x >> 1, y >> 1, iWcount, iSubBlock, pmv, psad);
+	bPredEq = get_pmvdata2(pMBs, iWcount, 0, x >> 1, y >> 1, iSubBlock, pmv, psad);
 
 
 /* Step 4: Calculate SAD around the Median prediction.