--- xvid.h	2003/05/15 13:00:37	1.27.2.18
+++ xvid.h	2003/06/09 13:51:26	1.27.2.22
@@ -3,23 +3,23 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - XviD Main header file -
  *
- *  This file is part of XviD, a free MPEG-4 video encoder/decoder
+ *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  This program is free software ; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation ; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  but WITHOUT ANY WARRANTY ; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
+ *  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.18 2003/05/15 13:00:37 suxen_drol Exp $
+ * $Id: xvid.h,v 1.27.2.22 2003/06/09 13:51:26 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -169,11 +169,22 @@
 #define XVID_CPU_ALTIVEC    0x00000001   /* altivec */
 
 
+#define XVID_DEBUG_ERROR       0x00000001
+#define XVID_DEBUG_STARTCODE   0x00000002
+#define XVID_DEBUG_HEADER      0x00000004
+#define XVID_DEBUG_TIMECODE    0x00000008
+#define XVID_DEBUG_MB          0x00000010
+#define XVID_DEBUG_COEFF       0x00000020
+#define XVID_DEBUG_MV          0x00000040
+#define XVID_DEBUG_RC          0x00000080
+#define XVID_DEBUG_DEBUG       0x80000000
+
 /* XVID_GBL_INIT param1 */
 typedef struct {
 	int version;
 	int cpu_flags;			/* [in:opt]	zero = autodetect cpu
 									XVID_CPU_FORCE|{cpu features} = force cpu features */
+    int debug;              /* [in:opt] debug level */
 } xvid_gbl_init_t;
 
 
@@ -431,10 +442,6 @@
 } xvid_plugin_2pass1_t;
 
 
-#define XVID_CURVE_COSINE   0   /* low aggressiveness */
-#define XVID_CURVE_LINEAR   1   /* medium aggressiveness */
-#define XVID_CURVE_SINE     2   /* high aggressiveness */
-
 #define XVID_PAYBACK_BIAS   0   /* payback with bias */
 #define XVID_PAYBACK_PROP   1   /* payback proportionally */
 
@@ -451,19 +458,11 @@
     int max_overflow_improvement;
     int max_overflow_degradation;
 
-    int use_alt_curve;
-	int alt_curve_high_dist;
-	int alt_curve_low_dist;
-    int alt_curve_use_auto;
-	int alt_curve_auto_str;
-	int alt_curve_type; /* XVID_CURVE_ */
-	int alt_curve_min_rel_qual;
-	int alt_curve_use_auto_bonus_bias;
-    int alt_curve_bonus_bias;
-
     int kftreshold;
 	int kfreduction;
     int min_key_interval;
+
+	int container_frame_overhead;
 }xvid_plugin_2pass2_t;