--- xvid.h	2004/01/07 13:51:02	1.27.2.62
+++ xvid.h	2004/05/09 14:00:35	1.27.2.67
@@ -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.62 2004/01/07 13:51:02 edgomez Exp $
+ * $Id: xvid.h,v 1.27.2.67 2004/05/09 14:00:35 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,0,-126)
+#define XVID_VERSION             XVID_MAKE_VERSION(1,0,-124)
 #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 "0025"
+#define XVID_BS_VERSION "0030"
 
 
 /*****************************************************************************
@@ -96,7 +96,8 @@
 
 /* colorspace values */
 
-#define XVID_CSP_USER     (1<< 0) /* 4:2:0 planar (==I420, except for pointers/strides) */
+#define XVID_CSP_PLANAR   (1<< 0) /* 4:2:0 planar (==I420, except for pointers/strides) */
+#define XVID_CSP_USER	  XVID_CSP_PLANAR
 #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 */
@@ -517,6 +518,14 @@
 								   *      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 */
+
+#ifdef VBV
+  int vbvsize;
+  int vbvinitial;
+  int vbv_maxrate;
+  int vbv_peakrate;
+#endif
+
 }xvid_plugin_2pass2_t;
 
 /*****************************************************************************