--- branches/dev-api-3/xvidcore/src/encoder.h	2002/12/09 10:47:05	701
+++ branches/dev-api-3/xvidcore/src/encoder.h	2003/01/11 14:59:24	769
@@ -36,7 +36,7 @@
  *               support for EXTENDED API
  *  - 22.08.2001 fixed bug in iDQtab
  *
- *  $Id: encoder.h,v 1.18.2.7 2002-12-09 10:47:05 suxen_drol Exp $
+ *  $Id: encoder.h,v 1.18.2.9 2003-01-11 14:59:23 chl Exp $
  *
  ****************************************************************************/
 
@@ -46,7 +46,6 @@
 #include "xvid.h"
 #include "portab.h"
 #include "global.h"
-#include "image/image.h"
 #include "utils/ratecontrol.h"
 
 /*****************************************************************************
@@ -99,10 +98,6 @@
 	int bquant_offset;
 	int frame_drop_ratio;
 
-#ifdef _SMP
-	int num_threads;
-#endif
-	
 	int iMaxKeyInterval;
 	int max_bframes;
 
@@ -133,6 +128,7 @@
 	int kblks;
 	int mblks;
 	int ublks;
+	int gblks;
 }
 Statistics;
 
@@ -156,14 +152,15 @@
 	IMAGE image;
 
 	MACROBLOCK *mbs;
-	VECTOR GMC_MV;
 
+	WARPPOINTS warp;		// as in bitstream
+	GMC_DATA gmc_data;		// common data for all MBs
+		
 	Statistics sStat;
 }
 FRAMEINFO;
 
 
-
 typedef struct
 {
 	MBParam mbParam;
@@ -185,6 +182,8 @@
 	IMAGE vInterHV;
 	IMAGE vInterHVf;
 
+	IMAGE vGMC;
+
 	/* image queue */
 	int queue_head;
 	int queue_tail;