--- encoder.h	2003/03/26 11:01:03	1.27.2.6
+++ encoder.h	2003/06/09 01:16:35	1.27.2.9
@@ -36,7 +36,7 @@
  *               support for EXTENDED API
  *  - 22.08.2001 fixed bug in iDQtab
  *
- *  $Id: encoder.h,v 1.27.2.6 2003/03/26 11:01:03 suxen_drol Exp $
+ *  $Id: encoder.h,v 1.27.2.9 2003/06/09 01:16:35 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -46,7 +46,6 @@
 #include "xvid.h"
 #include "portab.h"
 #include "global.h"
-#include "utils/ratecontrol.h"
 
 /*****************************************************************************
  * Constants
@@ -79,11 +78,16 @@
 	uint32_t fincr;
 	uint32_t fbase;
 
+    int profile;
+
 	xvid_global_t global_flags;
 	int bquant_ratio;
 	int bquant_offset;
 	int frame_drop_ratio;
 
+    int min_quant[3];
+    int max_quant[3];
+
 #ifdef _SMP
 	int num_threads;
 #endif
@@ -153,8 +157,8 @@
 
 	MACROBLOCK *mbs;
 
-	WARPPOINTS warp;		// as in bitstream
-	GMC_DATA gmc_data;		// common data for all MBs
+	WARPPOINTS warp;		/* as in bitstream */
+	GMC_DATA gmc_data;		/* common data for all MBs */
 
     int length;         /* the encoded size of this frame */
 		
@@ -170,15 +174,19 @@
 	int iFrameNum;
 	int bitrate;
 
-    // plugins
+    /* zones */
+    unsigned int num_zones;
+    xvid_enc_zone_t * zones;
+
+    /* plugins */
     unsigned int num_plugins;    /* note: we store plugin flags in MBPARAM */
     xvid_enc_plugin_t * plugins;
 
-    // dquant
+    /* dquant */
 
     int * temp_dquants;
 
-	// images
+	/* images */
 
 	FRAMEINFO *current;
 	FRAMEINFO *reference;
@@ -215,8 +223,6 @@
 
 	int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */
 
-	RateControl rate_control;
-
 	float fMvPrevSigma;
 }
 Encoder;