--- xvid.h	2003/06/09 19:42:12	1.27.2.23
+++ xvid.h	2003/07/28 12:29:01	1.27.2.29
@@ -19,7 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: xvid.h,v 1.27.2.23 2003/06/09 19:42:12 edgomez Exp $
+ * $Id: xvid.h,v 1.27.2.29 2003/07/28 12:29:01 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -67,7 +67,7 @@
  * doesnt hurt but not increasing it could cause difficulty for decoders in the
  * future
  */
-#define XVID_BS_VERSION "0011"
+#define XVID_BS_VERSION "0016"
 
 
 /*****************************************************************************
@@ -99,7 +99,7 @@
 #define XVID_CSP_BGRA		6	/* 32-bit bgra packed */
 #define XVID_CSP_ABGR		7	/* 32-bit abgr packed */
 #define XVID_CSP_RGBA		8	/* 32-bit rgba packed */
-#define XVID_CSP_BGR 		9 	/* 32-bit bgr packed */
+#define XVID_CSP_BGR 		9 	/* 24-bit bgr packed */
 #define XVID_CSP_RGB555	    10	/* 16-bit rgb555 packed */
 #define XVID_CSP_RGB565	    11	/* 16-bit rgb565 packed */
 #define XVID_CSP_SLICE		12	/* decoder only: 4:2:0 planar, per slice rendering */
@@ -523,6 +523,9 @@
 
     /* only valid for vol_flags|=XVID_VOL_REDUCED_ENABLED */
     XVID_VOP_REDUCED            = 0x00001000, /* reduced resolution vop */
+
+    XVID_VOP_CARTOON			= 0x00002000, /* use 'cartoon mode' */
+
 } xvid_vop_t;
 
 
@@ -558,7 +561,10 @@
     XVID_ME_UNRESTRICTED16      = 0x00200000, /* unrestricted ME, not implemented */
     XVID_ME_OVERLAPPING16       = 0x00400000, /* overlapping ME, not implemented */
     XVID_ME_UNRESTRICTED8       = 0x20000000, /* unrestricted ME, not implemented */
-    XVID_ME_OVERLAPPING8        = 0x40000000 /* overlapping ME, not implemented */
+    XVID_ME_OVERLAPPING8        = 0x40000000, /* overlapping ME, not implemented */
+
+    XVID_GME_REFINE  = 0x00010000
+
 } xvid_motion_t;