--- trunk/xvidcore/src/motion/motion_est.c	2003/02/15 15:22:19	851
+++ trunk/xvidcore/src/motion/motion_est.c	2003/02/19 10:13:54	871
@@ -1154,7 +1154,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 +2271,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