--- xvid.h	2003/03/27 17:09:48	1.27.2.14
+++ xvid.h	2003/04/27 14:21:35	1.27.2.16
@@ -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.14 2003/03/27 17:09:48 edgomez Exp $
+ * $Id: xvid.h,v 1.27.2.16 2003/04/27 14:21:35 chl Exp $
  *
  ****************************************************************************/
 
@@ -390,7 +390,7 @@
 typedef struct
 {
     int version;
-    int bitrate;
+    int bitrate;				/* bits per second */
     int max_quantizer;
     int min_quantizer;
     int reaction_delay_factor;
@@ -414,8 +414,8 @@
 
 typedef struct {
     int version;
-    char * filename1;
-    char * filename2;
+    char * filename;
+	int bitrate;				/* bits per second */
 
     int keyframe_boost;             /* keyframe boost percentage: [0..100...]; */
     int payback_method;
@@ -486,6 +486,8 @@
     XVID_VOP_HALFPEL            = 0x00000004, /* use halfpel interpolation */
     XVID_VOP_INTER4V            = 0x00000008,
     
+    XVID_VOP_TRELLISQUANT       = 0x00000010, /* use trellis based R-D "optimal" quantization */
+
     XVID_VOP_CHROMAOPT          = 0x00000020, /* enable chroma optimization pre-filter */
     XVID_VOP_GREYSCALE          = 0x00000040, /* enable greyscale only mode (even for
                                               color input material chroma is ignored) */