--- branches/dev-api-4/xvidcore/src/motion/motion_est.h	2003/03/29 10:11:06	959
+++ branches/dev-api-4/xvidcore/src/motion/motion_est.h	2003/04/08 15:35:52	978
@@ -26,7 +26,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: motion_est.h,v 1.3.2.3 2003-03-29 10:11:06 edgomez Exp $
+ *  $Id: motion_est.h,v 1.3.2.5 2003-04-08 15:35:52 edgomez Exp $
  *
  ***************************************************************************/
 
@@ -90,12 +90,14 @@
 	(int)(29.6436*NEIGH_TEND_8X8 + 0.5), (int)(36.4949*NEIGH_TEND_8X8 + 0.5)	};
 
 // mv.length table
-static const uint32_t mvtab[33] = {
-	1, 2, 3, 4, 6, 7, 7, 7,
-	9, 9, 9, 10, 10, 10, 10, 10,
-	10, 10, 10, 10, 10, 10, 10, 10,
-	10, 11, 11, 11, 11, 11, 11, 12, 12
-};
+static const int mvtab[64] = {
+		1, 2, 3, 4, 6, 7, 7, 7,
+		9, 9, 9, 10, 10, 10, 10, 10,
+		10, 10, 10, 10, 10, 10, 10, 10,
+		10, 11, 11, 11, 11, 11, 11, 12,
+		12, 12, 12, 12, 12, 12, 12, 12,
+		12, 12, 12, 12, 12, 12, 12, 12,
+		12, 12, 12, 12, 12, 12, 12, 12, 12 };
 
 static const int DQtab[4] = {
 	-1, -2, 1, 2
@@ -112,12 +114,7 @@
 	VECTOR * currentMV;
 	VECTOR * currentQMV;
 	int32_t * iMinSAD;
-	const uint8_t * Ref;
-	const uint8_t * RefH;
-	const uint8_t * RefV;
-	const uint8_t * RefHV;
-	const uint8_t * RefCU;
-	const uint8_t * RefCV;
+	const uint8_t * RefP[6]; // N, V, H, HV, cU, cV
 	const uint8_t * CurU;
 	const uint8_t * CurV;
 	uint8_t * RefQ;
@@ -131,13 +128,7 @@
 	int chroma;
 	int rrv;
 //fields for interpolate and direct modes
-	const uint8_t * bRef;
-	const uint8_t * bRefH;
-	const uint8_t * bRefV;
-	const uint8_t * bRefHV;
-	const uint8_t * b_RefCU;
-	const uint8_t * b_RefCV;
-
+	const uint8_t * b_RefP[6]; // N, V, H, HV, cU, cV
 	VECTOR bpredMV;
 	uint32_t bFcode;
 // fields for direct mode