--- trunk/xvidcore/src/motion/estimation_bvop.c	2004/07/10 17:40:42	1484
+++ trunk/xvidcore/src/motion/estimation_bvop.c	2004/07/10 17:42:18	1485
@@ -21,7 +21,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: estimation_bvop.c,v 1.8 2004-07-10 11:23:41 syskin Exp $
+ * $Id: estimation_bvop.c,v 1.9 2004-07-10 17:42:18 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -972,9 +972,6 @@
 		for (i = 0; i < pParam->mb_width; i++) {
 			MACROBLOCK * const pMB = frame->mbs + i + j * pParam->mb_width;
 			const MACROBLOCK * const b_mb = b_mbs + i + j * pParam->mb_width;
-			int interpol_search = 0;
-			int bf_search = 0;
-			int bf_thresh = 0;
 			pMB->mode = -1;
 
 			initialize_searchData(&Data_d, &Data_f, &Data_b, &Data_i,
@@ -1018,8 +1015,8 @@
 			SearchInterpolate_initial(i, j, frame->motion_flags, pParam, &f_predMV, &b_predMV, &best_sad,
 								  &Data_i, Data_f.currentMV[0], Data_b.currentMV[0]);
 
-			if (((Data_i.iMinSAD[0] < 2*best_sad+2000) && (!(frame->motion_flags&XVID_ME_FAST_MODEINTERPOLATE))
-				|| Data_i.iMinSAD[0] <= best_sad))
+			if (((Data_i.iMinSAD[0] < 2*best_sad+2000) && !(frame->motion_flags&XVID_ME_FAST_MODEINTERPOLATE))
+				|| Data_i.iMinSAD[0] <= best_sad)
 
 				SearchInterpolate_final(i, j, frame->motion_flags, pParam, &best_sad, &Data_i);