--- trunk/xvidcore/src/motion/motion_est.c	2002/09/16 21:41:20	486
+++ trunk/xvidcore/src/motion/motion_est.c	2002/09/21 11:59:22	504
@@ -356,8 +356,8 @@
     {  iMinSAD=iSAD; currMV->x=(X); currMV->y=(Y); iDirection=(D); iFound=0; } } \
 }
 
+#if 0
 /* too slow and not fully functional at the moment */
-/*
 int32_t ZeroSearch16(
 					const uint8_t * const pRef,
 					const uint8_t * const pRefH,
@@ -396,7 +396,7 @@
 	return iSAD;
 
 }
-*/
+#endif /* 0 */
 
 int32_t
 Diamond16_MainSearch(const uint8_t * const pRef,
@@ -839,9 +839,13 @@
 		}
 		while (1);				//forever
 	}
+
 	return iMinSAD;
 }
 
+/* Disabled bframe specific code */
+#if 0
+
 #define CHECK_MV16_F_INTERPOL(X,Y) { \
   if ( ((X) <= f_max_dx) && ((X) >= f_min_dx) \
     && ((Y) <= f_max_dy) && ((Y) >= f_min_dy) ) \
@@ -898,6 +902,7 @@
     {  iMinSAD=iSAD; b_currMV->x=(X); b_currMV->y=(Y); iFound=0;} } \
 }
 
+
 int32_t
 Diamond16_InterpolMainSearch(const uint8_t * const f_pRef,
 							 const uint8_t * const f_pRefH,
@@ -1086,6 +1091,7 @@
 	return iMinSAD;
 }
 
+#endif /* 0 */
 
 int32_t
 AdvDiamond8_MainSearch(const uint8_t * const pRef,
@@ -2782,7 +2788,8 @@
 }
 
 
-
+/* Disabled bframe specific code */
+# if 0
 int32_t
 PMVfastIntSearch16(const uint8_t * const pRef,
 				const uint8_t * const pRefH,
@@ -3073,4 +3080,4 @@
 	currPMV->y = currMV->y - center_y;
 	return iMinSAD;
 }
-
+#endif /* 0 */