--- trunk/xvidcore/src/motion/smp_motion_est.c	2002/07/06 17:03:08	258
+++ trunk/xvidcore/src/motion/smp_motion_est.c	2002/07/10 19:31:05	288
@@ -78,14 +78,14 @@
 		
 	case MODE_INTER:
 	case MODE_INTER_Q:
-		pmv = get_pmv(pMBs, x, y, iWcount, 0);   
+		pmv = get_pmv2(pMBs, iWcount, 0, x, y, 0);   
 		pMB->pmvs[0].x = pMB->mvs[0].x - pmv.x;
 		pMB->pmvs[0].y = pMB->mvs[0].y - pmv.y;
 		break;
 				
 	case MODE_INTER4V:
 		for (k=0;k<4;k++) {
-			pmv = get_pmv(pMBs, x, y, iWcount, k);   
+			pmv = get_pmv2(pMBs, iWcount, 0, x, y, k);   
 			pMB->pmvs[k].x = pMB->mvs[k].x - pmv.x;
 			pMB->pmvs[k].y = pMB->mvs[k].y - pmv.y;
 		}
@@ -161,7 +161,7 @@
 		pCurrent = &current->image;
 		pRef = &reference->image;
 
-//		time = read_tsc();
+//		time = read_counter();
 
 		for (y = miny; y < maxy; y++)	{
 		for (x = minx; x < maxx; x++)	{
@@ -259,7 +259,7 @@
 			}
 		}	/* end of x/y loop */
 		
-//		fprintf(stderr,"[%d,%d] Full ME %lld ticks \n",arg->id,run,read_tsc()-time);
+//		fprintf(stderr,"[%d,%d] Full ME %lld ticks \n",arg->id,run,read_counter()-time);
 
 		pthread_mutex_lock(&me_mutex);
 
@@ -279,7 +279,7 @@
 
 //		fprintf(stderr,"[%d,%d] wait corrqueue %d done\n",arg->id,run,me_corrqueue);
 
-//		time = read_tsc();
+//		time = read_counter();
 
 //		if (me_iIntra <= iLimit) 
 //		{
@@ -303,7 +303,7 @@
 //			pthread_mutex_lock(&me_mutex);
 //		}
 
-//		fprintf(stderr,"[%d,%d] Full CORR %lld ticks \n",arg->id,run,read_tsc()-time);
+//		fprintf(stderr,"[%d,%d] Full CORR %lld ticks \n",arg->id,run,read_counter()-time);
 
 		me_outqueue--;