--- xvid.h	2003/11/09 20:49:21	1.27.2.42
+++ xvid.h	2003/12/06 10:56:10	1.27.2.49
@@ -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.42 2003/11/09 20:49:21 edgomez Exp $
+ * $Id: xvid.h,v 1.27.2.49 2003/12/06 10:56:10 chl Exp $
  *
  ****************************************************************************/
 
@@ -57,7 +57,7 @@
 #define XVID_API_MAJOR(a)        (((a)>>16) & 0xff)
 #define XVID_API_MINOR(a)        (((a)>> 0) & 0xff)
 
-#define XVID_VERSION             XVID_MAKE_VERSION(1,-127,0)
+#define XVID_VERSION             XVID_MAKE_VERSION(1,0,-127)
 #define XVID_API                 XVID_MAKE_API(4, 0)
 
 #define XVID_UNSTABLE
@@ -73,7 +73,7 @@
  * doesnt hurt but not increasing it could cause difficulty for decoders in the
  * future
  */
-#define XVID_BS_VERSION "0020"
+#define XVID_BS_VERSION "0023"
 
 
 /*****************************************************************************
@@ -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 */
@@ -277,7 +277,7 @@
 			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;            /* [out] pixel aspect ratio (refer to XVID_PAR_xxx above) */
 			int par_width;      /* [out] aspect ratio width */
 			int par_height;     /* [out] aspect ratio height */
 		} vol;
@@ -313,7 +313,8 @@
 #define XVID_PLG_DESTROY (1<<1)
 #define XVID_PLG_INFO    (1<<2)
 #define XVID_PLG_BEFORE  (1<<3)
-#define XVID_PLG_AFTER   (1<<4)
+#define XVID_PLG_FRAME   (1<<4)
+#define XVID_PLG_AFTER   (1<<5)
 
 /* xvid_plg_info_t.flags */
 #define XVID_REQORIGINAL (1<<0) /* plugin requires a copy of the original (uncompressed) image */
@@ -472,8 +473,11 @@
 	int max_overflow_improvement; /* [in] percentage of allowed range for a frame that gets bigger because of overflow bonus */
 	int max_overflow_degradation; /* [in] percentage of allowed range for a frame that gets smaller because of overflow penalty */
 
-	int kfreduction;              /* [in] */
-	int min_key_interval;         /* [in] Minimum interval of frames between two IFrames */
+	int kfreduction;              /* [in] maximum bitrate reduction applied to an iframe under the kfthreshold distance limit */
+	int kfthreshold;              /* [in] if an iframe is closer to the next iframe than this distance, a quantity of bits
+								   *      is substracted from its bit allocation. The reduction is computed as multiples of
+								   *      kfreduction/kthreshold. It reaches kfreduction when the distance == kfthreshold,
+								   *      0 for 1<distance<kfthreshold */
 
 	int container_frame_overhead; /* [in] How many bytes the controller has to compensate per frame due to container format overhead */
 }xvid_plugin_2pass2_t;
@@ -616,7 +620,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 */
 	/* ---------------------------------------------- */