--- encoder.h	2003/06/09 13:50:44	1.27.2.10
+++ encoder.h	2003/10/01 23:23:00	1.27.2.15
@@ -20,7 +20,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: encoder.h,v 1.27.2.10 2003/06/09 13:50:44 edgomez Exp $
+ * $Id: encoder.h,v 1.27.2.15 2003/10/01 23:23:00 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -59,12 +59,12 @@
     int plugin_flags;
 
 	/* frame rate increment & base */
-	uint32_t fincr;
+	int32_t fincr;
 	uint32_t fbase;
 
     int profile;
 
-	xvid_global_t global_flags;
+	int global_flags;
 	int bquant_ratio;
 	int bquant_offset;
 	int frame_drop_ratio;
@@ -72,6 +72,10 @@
     int min_quant[3];
     int max_quant[3];
 
+	int par;
+	int par_width;
+	int par_height;
+
 #ifdef _SMP
 	int num_threads;
 #endif
@@ -89,7 +93,7 @@
 	/* vars that not "quite" frame independant */
 	uint32_t m_rounding_type;
 	uint32_t m_fcode;
-    xvid_vol_t vol_flags;
+    int vol_flags;
 
 	int64_t m_stamp;
 }
@@ -123,9 +127,9 @@
 {
     int frame_num;
     int fincr;
-	xvid_vol_t vol_flags;
-    xvid_vop_t vop_flags;
-	xvid_motion_t motion_flags;
+	int vol_flags;
+    int vop_flags;
+	int motion_flags;
 
 	int coding_type;
 	uint32_t quant;
@@ -143,9 +147,10 @@
 
 	WARPPOINTS warp;		/* as in bitstream */
 	GMC_DATA gmc_data;		/* common data for all MBs */
+	NEW_GMC_DATA new_gmc_data;		/* common data for all MBs */
 
     int length;         /* the encoded size of this frame */
-		
+
 	Statistics sStat;
 }
 FRAMEINFO;
@@ -163,7 +168,7 @@
     xvid_enc_zone_t * zones;
 
     /* plugins */
-    unsigned int num_plugins;    /* note: we store plugin flags in MBPARAM */
+    int num_plugins;    /* note: we store plugin flags in MBPARAM */
     xvid_enc_plugin_t * plugins;
 
     /* dquant */