--- branches/dev-api-3/xvidcore/src/xvid.h	2002/10/30 18:06:41	616
+++ branches/dev-api-3/xvidcore/src/xvid.h	2002/11/04 10:53:49	627
@@ -28,7 +28,7 @@
 *               ToDo ? : when BFRAMES is defined, the API_VERSION should not
 *                        be the same (3.0 ?)
 *
-*  $Id: xvid.h,v 1.17.2.4 2002-10-30 18:06:41 Isibaar Exp $
+*  $Id: xvid.h,v 1.17.2.8 2002-11-04 10:53:49 syskin Exp $
 *
 *****************************************************************************/
 
@@ -58,7 +58,7 @@
  * doesnt hurt but not increasing it could cause difficulty for decoders in the
  * future
  */
-#define XVID_BS_VERSION "0002"
+#define XVID_BS_VERSION "0003"
 
 
 /* Error codes */
@@ -225,10 +225,11 @@
 #define XVID_ME_PMVFAST			0x00080000
 #define XVID_ME_EPZS			0x00100000
 
-
 #define XVID_GREYSCALE			0x01000000	/* enable greyscale only mode (even for */
 #define XVID_GRAYSCALE			0x01000000  /* color input material chroma is ignored) */
 
+#define XVID_GMC				0x20000000
+#define XVID_ME_COLOUR			0x40000000
 
 /* Flags for XVID_ENC_FRAME.motion */
 #define PMV_ADVANCEDDIAMOND8	0x00004000
@@ -253,6 +254,7 @@
 #define PMV_USESQUARES8			0x80000000
 
 
+
 /*****************************************************************************
  * Encoder structures
  ****************************************************************************/
@@ -271,7 +273,6 @@
 #ifdef _SMP
 		int num_threads;		/* number of threads */
 #endif
-#ifdef BFRAMES
 		int global;				/* global/debug options */
 		int max_bframes;		/* max sequential bframes (0=disable bframes) */
 		int bquant_ratio;		/* bframe quantizer multipier (percentage).
@@ -280,7 +281,6 @@
 								 * quant = ((past_quant + future_quant) * bquant_ratio)/200
 								 */
 		int frame_drop_ratio;   /* frame dropping: 0=drop none... 100=drop all */
-#endif
 		void *handle;			/* [out] encoder instance handle */
 	}
 	XVID_ENC_PARAM;
@@ -335,9 +335,7 @@
 								 */
 		HINTINFO hint;			/* [in/out] mv hint information */
 
-#ifdef BFRAMES
 		int bquant;				/* [in] bframe quantizer */
-#endif
 
 	}
 	XVID_ENC_FRAME;