--- xvid.h	2002/12/12 10:37:44	1.17.2.14
+++ xvid.h	2003/01/04 06:14:32	1.17.2.19
@@ -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.14 2002/12/12 10:37:44 suxen_drol Exp $
+*  $Id: xvid.h,v 1.17.2.19 2003/01/04 06:14:32 suxen_drol Exp $
 *
 *****************************************************************************/
 
@@ -46,6 +46,7 @@
 
 /* API Version : 2.1 */
 #define API_VERSION ((2 << 16) | (1))
+#define XVID_API_UNSTABLE
 
 /* Bitstream Version 
  * this will be writen into the bitstream to allow easy detection of xvid 
@@ -95,20 +96,23 @@
  ****************************************************************************/
 
 /* CPU flags for XVID_INIT_PARAM.cpu_flags */
+#define XVID_CPU_FORCE		0x80000000
+#define XVID_CPU_CHKONLY	0x40000000		/* check cpu only; dont init globals */
 
-#define XVID_CPU_MMX		0x00000001
-#define XVID_CPU_MMXEXT		0x00000002
-#define XVID_CPU_SSE		0x00000004 
-#define XVID_CPU_SSE2		0x00000008
-#define XVID_CPU_3DNOW		0x00000010
-#define XVID_CPU_3DNOWEXT	0x00000020
-
-#define XVID_CPU_TSC		0x00000040
-
-#define XVID_CPU_IA64		0x00000080
+#define XVID_CPU_ASM		0x00000080		/* native assembly */
+/* ARCH_X86 */
+#define XVID_CPU_MMX		0x00000001		/* mmx: pentiumMMX,k6 */
+#define XVID_CPU_MMXEXT		0x00000002		/* mmxx-ext: pentium2,athlon */
+#define XVID_CPU_SSE		0x00000004		/* sse: pentium3,athlonXP */
+#define XVID_CPU_SSE2		0x00000008		/* sse2: pentium4,athlon64 */
+#define XVID_CPU_3DNOW		0x00000010		/* 3dnow: k6-2 */
+#define XVID_CPU_3DNOWEXT	0x00000020		/* 3dnow-ext: athlon */
+#define XVID_CPU_TSC		0x00000040		/* timestamp counter */
+/* ARCH_IA64 */
+#define XVID_CPU_IA64		XVID_CPU_ASM	/* defined for backward compatibility */
+/* ARCH_PPC */
+#define XVID_CPU_ALTIVEC	0x00000001		/* altivec */
 
-#define XVID_CPU_CHKONLY	0x40000000		/* check cpu only; dont init globals */
-#define XVID_CPU_FORCE		0x80000000
 
 	typedef struct
 	{
@@ -122,6 +126,7 @@
 
 #define XVID_INIT_INIT		0
 #define XVID_INIT_CONVERT	1
+#define XVID_INIT_TEST		2
 
 /*****************************************************************************
  *  Initialization structures
@@ -160,6 +165,10 @@
 
 /* Flags for XVID_DEC_FRAME.general */
 #define XVID_DEC_LOWDELAY		0x00000001	/* decode lowdelay mode (ie. video-for-windows) */
+#define XVID_DEC_DEBLOCKY		0x00000002	/* luma deblocking */
+#define XVID_DEC_DEBLOCKUV		0x00000008	/* chroma deblocking */
+#define XVID_DEC_DISCONTINUITY	0x00000004	/* indicates break in stream; instructs 
+											decoder to ignore any previous reference frames */
 #define XVID_QUICK_DECODE		0x00000010
 
 /*****************************************************************************