--- estimation.h	2003/09/10 22:18:59	1.1.2.1
+++ estimation.h	2003/10/03 14:23:00	1.1.2.4
@@ -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.h,v 1.1.2.1 2003/09/10 22:18:59 edgomez Exp $
+ * $Id: estimation.h,v 1.1.2.4 2003/10/03 14:23:00 syskin Exp $
  *
  ****************************************************************************/
 
@@ -77,7 +77,6 @@
 	VECTOR predMV;
 	VECTOR * currentMV;
 	VECTOR * currentQMV;
-	VECTOR * currentMV2;
 	VECTOR * currentQMV2;
 	int32_t * iMinSAD;
 	int32_t * iMinSAD2;
@@ -111,6 +110,7 @@
 	uint32_t iQuant;
 	uint32_t quant_type;
 	int * cbp;
+	const uint16_t * scan_table;
 
 } SearchData;
 
@@ -146,15 +146,6 @@
 void
 xvid_me_SubpelRefine(const SearchData * const data, CheckFunc * const CheckCandidate);
 
-int
-globalSAD(const WARPPOINTS *const wp,
-		const MBParam * const pParam,
-		const MACROBLOCK * const pMBs,
-		const FRAMEINFO * const current,
-		const IMAGE * const pRef,
-		const IMAGE * const pCurr,
-		uint8_t *const GMCblock);
-
 void
 xvid_me_ModeDecision_RD(SearchData * const Data,
 		MACROBLOCK * const pMB,