--- trunk/xvidcore/src/motion/motion_est.c	2003/02/15 15:22:19	851
+++ trunk/xvidcore/src/motion/motion_est.c	2003/02/19 20:12:43	872
@@ -46,6 +46,26 @@
 #include "../utils/emms.h"
 #include "../dct/fdct.h"
 
+/*****************************************************************************
+ * Modified rounding tables -- declared in motion.h
+ * Original tables see ISO spec tables 7-6 -> 7-9
+ ****************************************************************************/
+
+const uint32_t roundtab[16] =
+{0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2 };
+
+/* K = 4 */
+const uint32_t roundtab_76[16] =
+{ 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1 };
+
+/* K = 2 */
+const uint32_t roundtab_78[8] =
+{ 0, 0, 1, 1, 0, 0, 0, 1  };
+
+/* K = 1 */
+const uint32_t roundtab_79[4] =
+{ 0, 1, 0, 0 };
+
 #define INITIAL_SKIP_THRESH	(10)
 #define FINAL_SKIP_THRESH	(50)
 #define MAX_SAD00_FOR_SKIP	(20)
@@ -54,6 +74,10 @@
 #define CHECK_CANDIDATE(X,Y,D) { \
 CheckCandidate((X),(Y), (D), &iDirection, data ); }
 
+/*****************************************************************************
+ * Code
+ ****************************************************************************/
+
 static __inline uint32_t
 d_mv_bits(int x, int y, const VECTOR pred, const uint32_t iFcode, const int qpel, const int rrv)
 {
@@ -1154,7 +1178,7 @@
 	int mode = MODE_INTER;
 
 	if (!(GlobalFlags & XVID_MODEDECISION_BITS)) { //normal, fast, SAD-based mode decision
-		int intra = 0;
+//		int intra = 0;
 		int sad;
 		int InterBias = MV16_INTER_BIAS;
 		if (inter4v == 0 || Data->iMinSAD[0] < Data->iMinSAD[1] + Data->iMinSAD[2] +
@@ -2271,7 +2295,11 @@
 	double meanx,meany;
 	int num,oldnum;
 
-	if (!MBmask) { fprintf(stderr,"Mem error\n"); return gmc;}
+	if (!MBmask) { fprintf(stderr,"Mem error\n"); 
+			       gmc.duv[0].x= gmc.duv[0].y = 
+				   		gmc.duv[1].x= gmc.duv[1].y = 			
+						gmc.duv[2].x= gmc.duv[2].y = 0;
+					return gmc; }
 
 // filter mask of all blocks