--- xvid.h	2002/07/12 12:26:24	1.14
+++ xvid.h	2002/10/06 07:05:50	1.17.2.2
@@ -28,7 +28,7 @@
 *               ToDo ? : when BFRAMES is defined, the API_VERSION should not
 *                        be the same (3.0 ?)
 *
-*  $Id: xvid.h,v 1.14 2002/07/12 12:26:24 suxen_drol Exp $
+*  $Id: xvid.h,v 1.17.2.2 2002/10/06 07:05:50 suxen_drol Exp $
 *
 *****************************************************************************/
 
@@ -37,7 +37,7 @@
 #define _XVID_H_
 
 #ifdef __cplusplus
-*  $Id: xvid.h,v 1.14 2002/07/12 12:26:24 suxen_drol Exp $
+extern "C" {
 #endif
 
 /*****************************************************************************
@@ -56,7 +56,7 @@
 
 
 /* Colorspaces */
-#define XVID_CSP_RGB24 	0
+#define XVID_CSP_RGB24 	0		/* [b|g|r] */
 #define XVID_CSP_YV12	1
 #define XVID_CSP_YUY2	2
 #define XVID_CSP_UYVY	3
@@ -66,13 +66,19 @@
 #define XVID_CSP_USER	12
 #define XVID_CSP_EXTERN      1004  // per slice rendering
 #define XVID_CSP_YVYU	1002
-#define XVID_CSP_RGB32 	1000
+#define XVID_CSP_RGB32 	1000	/* [b|g|r|a] */
+#define XVID_CSP_ABGR	1006	/* [a|b|g|r] */
+#define XVID_CSP_RGBA	1005	/* [r|g|b|a] */
+
+
+
 #define XVID_CSP_NULL 	9999
 
 #define XVID_CSP_VFLIP	0x80000000	// flip mask
 
 
 /*****************************************************************************
+ *  Initialization constants
  ****************************************************************************/
 
 /* CPU flags for XVID_INIT_PARAM.cpu_flags */
@@ -154,6 +160,14 @@
 		int stride_y, stride_u,stride_v;
 	} XVID_DEC_PICTURE;
 
+
+/*****************************************************************************
+ * Decoder entry point
+ ****************************************************************************/
+
+/* decoder options */
+#define XVID_DEC_DECODE		0
+#define XVID_DEC_CREATE		1
 #define XVID_DEC_DESTROY	2
 
 	int xvid_decore(void *handle,
@@ -178,6 +192,7 @@
 #define XVID_H263QUANT			0x00000010
 #define XVID_MPEGQUANT			0x00000020
 #define XVID_HALFPEL			0x00000040	/* use halfpel interpolation */
+#define XVID_QUARTERPEL			0x02000000
 #define XVID_ADAPTIVEQUANT		0x00000080
 #define XVID_LUMIMASKING		0x00000100
 #define XVID_LATEINTRA			0x00000200
@@ -199,13 +214,17 @@
 
 
 #define XVID_GREYSCALE			0x01000000	/* enable greyscale only mode (even for */
-#define XVID_GRAYSCALE			0x01000000      /* color input material chroma is ignored) */
+#define XVID_GRAYSCALE			0x01000000  /* color input material chroma is ignored) */
 
 
 /* Flags for XVID_ENC_FRAME.motion */
 #define PMV_ADVANCEDDIAMOND8	0x00004000
 #define PMV_ADVANCEDDIAMOND16   0x00008000
-#define PMV_EARLYSTOP16	   		0x00080000
+
+#define PMV_HALFPELDIAMOND16 	0x00010000
+#define PMV_HALFPELREFINE16 	0x00020000
+#define PMV_QUARTERPELREFINE16	0x00040000
+#define PMV_EXTSEARCH16 		0x00080000	/* extend PMV by more searches */
 #define PMV_QUICKSTOP16	   		0x00100000	/* like early, but without any more refinement */
 #define PMV_UNRESTRICTED16   	0x00200000	/* unrestricted ME, not implemented */
 #define PMV_OVERLAPPING16   	0x00400000	/* overlapping ME, not implemented */
@@ -213,8 +232,8 @@
 
 #define PMV_HALFPELDIAMOND8 	0x01000000
 #define PMV_HALFPELREFINE8 		0x02000000
-#define PMV_EXTSEARCH8 			0x04000000	/* extend PMV by more searches */
-#define PMV_EARLYSTOP8	   		0x08000000
+#define PMV_QUARTERPELREFINE8	0x04000000
+#define PMV_EXTSEARCH8 			0x08000000	/* extend PMV by more searches */
 #define PMV_QUICKSTOP8	   		0x10000000	/* like early, but without any more refinement */
 #define PMV_UNRESTRICTED8   	0x20000000	/* unrestricted ME, not implemented */
 #define PMV_OVERLAPPING8   		0x40000000	/* overlapping ME, not implemented */
@@ -256,6 +275,7 @@
 	typedef struct
 	{
 		int x;
+		int y;
 	}
 	VECTOR;