--- branches/dev-api-4/xvidcore/src/encoder.h	2003/05/12 12:33:16	1014
+++ branches/dev-api-4/xvidcore/src/encoder.h	2003/06/09 01:25:19	1053
@@ -36,7 +36,7 @@
  *               support for EXTENDED API
  *  - 22.08.2001 fixed bug in iDQtab
  *
- *  $Id: encoder.h,v 1.27.2.7 2003-05-12 12:28:31 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
@@ -158,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 */
 		
@@ -175,19 +174,19 @@
 	int iFrameNum;
 	int bitrate;
 
-    // zones
+    /* zones */
     unsigned int num_zones;
     xvid_enc_zone_t * zones;
 
-    // plugins
+    /* 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;
@@ -224,8 +223,6 @@
 
 	int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */
 
-	RateControl rate_control;
-
 	float fMvPrevSigma;
 }
 Encoder;