--- trunk/xvidcore/src/xvid.h	2004/04/18 07:55:11	1437
+++ trunk/xvidcore/src/xvid.h	2005/04/04 23:49:37	1609
@@ -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.38 2004-04-18 07:55:11 syskin Exp $
+ * $Id: xvid.h,v 1.50 2005-04-04 23:49:37 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -57,8 +57,8 @@
 #define XVID_API_MAJOR(a)        (((a)>>16) & 0xff)
 #define XVID_API_MINOR(a)        (((a)>> 0) & 0xff)
 
-#define XVID_VERSION             XVID_MAKE_VERSION(1,1,-127)
-#define XVID_API                 XVID_MAKE_API(4, 0)
+#define XVID_VERSION             XVID_MAKE_VERSION(1,1,-125)
+#define XVID_API                 XVID_MAKE_API(4, 1)
 
 #define XVID_UNSTABLE
 
@@ -73,8 +73,7 @@
  * doesnt hurt but not increasing it could cause difficulty for decoders in the
  * future
  */
-#define XVID_BS_VERSION "0031"
-
+#define XVID_BS_VERSION 39
 
 /*****************************************************************************
  * error codes
@@ -264,7 +263,7 @@
 	void *bitstream;     /* [in]     bitstream (read from)*/
 	int length;          /* [in]     bitstream length */
 	xvid_image_t output; /* [in]     output image (written to) */
-/* ------- v1.1.0 ------- */
+/* ------- v1.1.x ------- */
 	int brightness;		 /* [in]	 brightness offset (0=none) */
 } xvid_dec_frame_t;
 
@@ -509,7 +508,7 @@
 typedef struct {
 	int version;
 
-	int bitrate;                  /* [in] bits per second */
+	int bitrate;                  /* [in] target bitrate (bits per second) */
 	char * filename;              /* [in] first pass stats filename */
 
 	int keyframe_boost;           /* [in] keyframe boost percentage: [0..100] */
@@ -526,6 +525,13 @@
 								   *      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 */
+
+/* ------- v1.1.x ------- */
+	int vbv_size;                 /* [in] buffer size (bits) */
+	int vbv_initial;              /* [in] initial buffer occupancy (bits) */
+	int vbv_maxrate;              /* [in] max processing bitrate (bits per second) */
+	int vbv_peakrate;             /* [in:opt] max average bitrate over 3 seconds (bits per second) */
+
 }xvid_plugin_2pass2_t;
 
 /*****************************************************************************
@@ -587,7 +593,8 @@
 #define XVID_GLOBAL_VOL_AT_IVOP       (1<<3) /* write vol at every ivop: WIN32/divx compatibility */
 #define XVID_GLOBAL_FORCE_VOL         (1<<4) /* when vol-based parameters are changed, insert an ivop NOT recommended */
 #endif
-
+#define XVID_GLOBAL_DIVX5_USERDATA    (1<<5) /* write divx5 userdata string 
+                                                this is implied if XVID_GLOBAL_PACKED is set */
 
 /*----------------------------------------------------------------------------
  * "VOL" flags
@@ -622,6 +629,7 @@
 #define XVID_VOP_HQACPRED             (1<< 7) /* high quality ac prediction */
 #define XVID_VOP_MODEDECISION_RD      (1<< 8) /* enable DCT-ME and use it for mode decision */
 #define XVID_VOP_FAST_MODEDECISION_RD (1<<12) /* use simplified R-D mode decision */
+#define XVID_VOP_RD_BVOP              (1<<13) /* enable rate-distortion mode decision in b-frames */
 
 /* Only valid for vol_flags|=XVID_VOL_INTERLACING */
 #define XVID_VOP_TOPFIELDFIRST        (1<< 9) /* set top-field-first flag  */