--- xvid.h	2003/12/05 14:44:35	1.27.2.47
+++ xvid.h	2003/12/12 14:16:40	1.27.2.52
@@ -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.47 2003/12/05 14:44:35 edgomez Exp $
+ * $Id: xvid.h,v 1.27.2.52 2003/12/12 14:16:40 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -73,7 +73,7 @@
  * doesnt hurt but not increasing it could cause difficulty for decoders in the
  * future
  */
-#define XVID_BS_VERSION "0023"
+#define XVID_BS_VERSION "0024"
 
 
 /*****************************************************************************
@@ -96,9 +96,9 @@
 
 /* colorspace values */
 
-#define XVID_CSP_USER     (1<< 0) /* 4:2:0 planar */
-#define XVID_CSP_I420     (1<< 1) /* 4:2:0 packed(planar win32) */
-#define XVID_CSP_YV12     (1<< 2) /* 4:2:0 packed(planar win32) */
+#define XVID_CSP_USER     (1<< 0) /* 4:2:0 planar (==I420, except for pointers/strides) */
+#define XVID_CSP_I420     (1<< 1) /* 4:2:0 planar */
+#define XVID_CSP_YV12     (1<< 2) /* 4:2:0 planar */
 #define XVID_CSP_YUY2     (1<< 3) /* 4:2:2 packed */
 #define XVID_CSP_UYVY     (1<< 4) /* 4:2:2 packed */
 #define XVID_CSP_YVYU     (1<< 5) /* 4:2:2 packed */
@@ -138,7 +138,7 @@
 #define XVID_PROFILE_AS_L4   0xf4
 
 /* aspect ratios */
-#define XVID_PAR_11_VGA    1 /* 1:1 vga (square), default if AR is not precised (ie: ==0) */
+#define XVID_PAR_11_VGA    1 /* 1:1 vga (square), default if supplied PAR is not a valid value */
 #define XVID_PAR_43_PAL    2 /* 4:3 pal (12:11 625-line) */
 #define XVID_PAR_43_NTSC   3 /* 4:3 ntsc (10:11 525-line) */
 #define XVID_PAR_169_PAL   4 /* 16:9 pal (16:11 625-line) */
@@ -246,6 +246,8 @@
 /* general flags */
 #define XVID_LOWDELAY      (1<<0) /* lowdelay mode  */
 #define XVID_DISCONTINUITY (1<<1) /* indicates break in stream */
+#define XVID_DEBLOCKY      (1<<2) /* perform luma deblocking */
+#define XVID_DEBLOCKUV     (1<<3) /* perform chroma deblocking */
 
 typedef struct {
 	int version;
@@ -277,9 +279,9 @@
 			int general;        /* [out] flags */
 			int width;          /* [out] width */
 			int height;         /* [out] height */
-			int par;            /* [out] picture aspect ratio (refer to XVID_PAR_xxx above) */
-			int par_width;      /* [out] aspect ratio width */
-			int par_height;     /* [out] aspect ratio height */
+			int par;            /* [out] pixel aspect ratio (refer to XVID_PAR_xxx above) */
+			int par_width;      /* [out] aspect ratio width  [1..255] */
+			int par_height;     /* [out] aspect ratio height [1..255] */
 		} vol;
 	} data;
 } xvid_dec_stats_t;
@@ -620,7 +622,7 @@
 	unsigned char *quant_intra_matrix; /* [in:opt] custom intra qmatrix */
 	unsigned char *quant_inter_matrix; /* [in:opt] custom inter qmatrix */
 
-	int par;                           /* [in:opt] picture aspect ratio (refer to XVID_PAR_xxx above) */
+	int par;                           /* [in:opt] pixel aspect ratio (refer to XVID_PAR_xxx above) */
 	int par_width;                     /* [in:opt] aspect ratio width */
 	int par_height;                    /* [in:opt] aspect ratio height */
 	/* ---------------------------------------------- */