--- trunk/xvidcore/src/xvid.h	2002/06/13 12:42:18	199
+++ trunk/xvidcore/src/xvid.h	2002/06/23 03:58:32	234
@@ -28,7 +28,7 @@
 *               ToDo ? : when BFRAMES is defined, the API_VERSION should not
 *                        be the same (3.0 ?)
 *
-*  $Id: xvid.h,v 1.10 2002-06-13 12:42:18 edgomez Exp $
+*  $Id: xvid.h,v 1.13 2002-06-23 03:58:32 suxen_drol Exp $
 *
 *****************************************************************************/
 
@@ -37,7 +37,7 @@
 #define _XVID_H_
 
 #ifdef __cplusplus
-*  $Id: xvid.h,v 1.10 2002-06-13 12:42:18 edgomez Exp $
+*  $Id: xvid.h,v 1.13 2002-06-23 03:58:32 suxen_drol Exp $
 #endif
 
 /*****************************************************************************
@@ -85,13 +85,19 @@
 #define XVID_CPU_3DNOWEXT	0x00000020
 
 #define XVID_CPU_TSC		0x00000040
+
 #define XVID_CPU_IA64		0x00000080
 
 #define XVID_CPU_CHKONLY	0x40000000		/* check cpu only; dont init globals */
 #define XVID_CPU_FORCE		0x80000000
 
 
+/*****************************************************************************
  *  Initialization structures
+ ****************************************************************************/
+
+	typedef struct
+	{
 		int cpu_flags;
 		int api_version;
 		int core_build;
@@ -169,6 +175,11 @@
 #define XVID_VALID_FLAGS		0x80000000
 
 #define XVID_CUSTOM_QMATRIX		0x00000004	/* use custom quant matrix */
+#define XVID_H263QUANT			0x00000010
+#define XVID_MPEGQUANT			0x00000020
+#define XVID_HALFPEL			0x00000040	/* use halfpel interpolation */
+#define XVID_ADAPTIVEQUANT		0x00000080
+#define XVID_LUMIMASKING		0x00000100
 #define XVID_LATEINTRA			0x00000200
 
 #define XVID_INTERLACING		0x00000400	/* enable interlaced encoding */
@@ -235,6 +246,7 @@
 								 * used only when bquant < 1
 								 * eg. 200 = x2 multiplier
 #endif
+		void *handle;			/* [out] encoder instance handle */
 	}
 	XVID_ENC_PARAM;
 
@@ -298,7 +310,6 @@
 	typedef struct
 	{
 		int quant;				/* [out] frame quantizer */
-		int input_consumed;		/* [out] */
 		int hlength;			/* [out] header length (bytes) */
 		int kblks, mblks, ublks;	/* [out] */