--- encoder.h	2002/12/10 11:13:50	1.18.2.8
+++ encoder.h	2003/01/25 22:44:50	1.18.2.10
@@ -36,7 +36,7 @@
  *               support for EXTENDED API
  *  - 22.08.2001 fixed bug in iDQtab
  *
- *  $Id: encoder.h,v 1.18.2.8 2002/12/10 11:13:50 suxen_drol Exp $
+ *  $Id: encoder.h,v 1.18.2.10 2003/01/25 22:44:50 chl Exp $
  *
  ****************************************************************************/
 
@@ -98,10 +98,6 @@
 	int bquant_offset;
 	int frame_drop_ratio;
 
-#ifdef _SMP
-	int num_threads;
-#endif
-	
 	int iMaxKeyInterval;
 	int max_bframes;
 
@@ -132,6 +128,7 @@
 	int kblks;
 	int mblks;
 	int ublks;
+	int gblks;
 }
 Statistics;
 
@@ -155,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;
@@ -175,15 +173,15 @@
 	FRAMEINFO *current;
 	FRAMEINFO *reference;
 
-#ifdef _DEBUG_PSNR
 	IMAGE sOriginal;
-#endif
 	IMAGE vInterH;
 	IMAGE vInterV;
 	IMAGE vInterVf;
 	IMAGE vInterHV;
 	IMAGE vInterHVf;
 
+	IMAGE vGMC;
+
 	/* image queue */
 	int queue_head;
 	int queue_tail;