--- xvid.h	2002/10/30 23:11:35	1.17.2.5
+++ xvid.h	2002/11/07 10:28:15	1.17.2.9
@@ -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.5 2002/10/30 23:11:35 Isibaar Exp $
+*  $Id: xvid.h,v 1.17.2.9 2002/11/07 10:28:15 suxen_drol Exp $
 *
 *****************************************************************************/
 
@@ -153,6 +153,32 @@
 	XVID_DEC_PARAM;
 
 
+#define XVID_DEC_VOP	0
+#define XVID_DEC_VOL	1
+
+	typedef struct
+	{
+		int notify;			/* [out]	output 'mode' */
+		union
+		{
+			struct	/* XVID_DEC_VOP */
+			{
+				int time_base;		/* [out]	time base */
+				int time_increment;	/* [out]	time increment */
+			} vop;
+			struct	/* XVID_DEC_VOL */
+			{
+				int general;		/* [out]	flags: eg. frames are interlaced */
+				int width;			/* [out]	width */
+				int height;			/* [out]	height */
+				int aspect_ratio;	/* [out]	aspect ratio */
+				int par_width;		/* [out]	aspect ratio width */
+				int par_height;		/* [out]	aspect ratio height */
+			} vol;
+		} data;
+	} XVID_DEC_STATS;
+
+
 	typedef struct
 	{
 		int general;
@@ -225,10 +251,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 +280,7 @@
 #define PMV_USESQUARES8			0x80000000
 
 
+
 /*****************************************************************************
  * Encoder structures
  ****************************************************************************/
@@ -271,7 +299,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 +307,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;
@@ -325,6 +351,7 @@
 		int length;				/* [out] bitstream length (bytes) */
 
 		void *image;			/* [in] image ptr */
+		int stride;
 		int colorspace;			/* [in] source colorspace */
 
 		unsigned char *quant_intra_matrix;	// [in] custom intra qmatrix */
@@ -335,9 +362,7 @@
 								 */
 		HINTINFO hint;			/* [in/out] mv hint information */
 
-#ifdef BFRAMES
 		int bquant;				/* [in] bframe quantizer */
-#endif
 
 	}
 	XVID_ENC_FRAME;