--- encoder.h	2003/03/13 11:07:20	1.27.2.2
+++ encoder.h	2003/03/16 12:04:14	1.27.2.5
@@ -36,7 +36,7 @@
  *               support for EXTENDED API
  *  - 22.08.2001 fixed bug in iDQtab
  *
- *  $Id: encoder.h,v 1.27.2.2 2003/03/13 11:07:20 suxen_drol Exp $
+ *  $Id: encoder.h,v 1.27.2.5 2003/03/16 12:04:14 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -52,13 +52,6 @@
  * Constants
  ****************************************************************************/
 
-/* Quatization type */
-#define H263_QUANT	0
-#define MPEG4_QUANT	1
-
-/* Indicates no quantizer changes in INTRA_Q/INTER_Q modes */
-#define NO_CHANGE 64
-
 /*****************************************************************************
  * Types
  ****************************************************************************/
@@ -80,6 +73,8 @@
 	uint32_t mb_width;
 	uint32_t mb_height;
 
+    int plugin_flags;
+
 	/* frame rate increment & base */
 	uint32_t fincr;
 	uint32_t fbase;
@@ -138,6 +133,8 @@
 
 typedef struct
 {
+    int frame_num;
+    int fincr;
 	xvid_vol_t vol_flags;
     xvid_vop_t vop_flags;
 	xvid_motion_t motion_flags;
@@ -174,9 +171,7 @@
 	int bitrate;
 
     // plugins
-
-    int plugin_flags;
-    int num_plugins;
+    unsigned int num_plugins;    /* note: we store plugin flags in MBPARAM */
     xvid_enc_plugin_t * plugins;
 
     // dquant
@@ -188,7 +183,8 @@
 	FRAMEINFO *current;
 	FRAMEINFO *reference;
 
-	IMAGE sOriginal;
+	IMAGE sOriginal;    /* original image copy for i/p frames */
+    IMAGE sOriginal2;   /* original image copy for b-frames */
 	IMAGE vInterH;
 	IMAGE vInterV;
 	IMAGE vInterVf;