--- branches/dev-api-4/xvidcore/vfw/src/config.h	2003/06/10 10:07:03	1061
+++ branches/dev-api-4/xvidcore/vfw/src/config.h	2004/01/02 13:18:28	1301
@@ -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: config.h,v 1.1.2.8 2003-06-10 10:07:03 suxen_drol Exp $
+ * $Id: config.h,v 1.1.2.16 2004-01-02 13:18:28 syskin Exp $
  *
  ****************************************************************************/
 #ifndef _CONFIG_H_
@@ -27,6 +27,7 @@
 
 #include <windows.h>
 #include "vfwext.h"
+#include <xvid.h>
 
 extern HINSTANCE g_hInst;
 
@@ -83,6 +84,7 @@
 {
     int frame;
     
+    int type;
     int mode;
     int weight;
     int quant;
@@ -121,6 +123,10 @@
 	int bquant_offset;
 	int packed;
 	int closed_gov;
+	int display_aspect_ratio;				/* aspect ratio */
+	int ar_x, ar_y;							/* picture aspect ratio */
+	int par_x, par_y;						/* custom pixel aspect ratio */
+	int ar_mode;							/* picture/pixel AR */
 
     /* zones */
     int num_zones;
@@ -137,21 +143,21 @@
 
     /* 2pass2 */
 	int keyframe_boost;
-	int kftreshold;
+	int kfthreshold;
 	int kfreduction;
 	int curve_compression_high;
 	int curve_compression_low;
+	int overflow_control_strength;
 	int twopass_max_overflow_improvement;
 	int twopass_max_overflow_degradation;
-	int bitrate_payback_delay;
-	int bitrate_payback_method;
 
     /* motion */
 	int motion_search;
 	int vhq_mode;
 	int chromame;
+	int cartoon_mode;
+	int turbo;
     int max_key_interval;
-	int min_key_interval;
 	int frame_drop_ratio;
 
     /* quant */
@@ -211,6 +217,17 @@
 #define PROFILE_AS			(PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_MPEGQUANT|PROFILE_INTERLACE|PROFILE_QPEL|PROFILE_GMC)
 #define PROFILE_ARTS		(PROFILE_ADAPTQUANT|PROFILE_REDUCED)
 
+static const int PARS[][2] = {
+	{1, 1},
+	{12, 11},
+	{10, 11},
+	{16, 11},
+	{40, 33},
+	{0, 0},
+};
+
+
+
 
 typedef struct
 {
@@ -240,5 +257,4 @@
 BOOL CALLBACK main_proc(HWND, UINT, WPARAM, LPARAM);
 BOOL CALLBACK about_proc(HWND, UINT, WPARAM, LPARAM);
 
-
 #endif /* _CONFIG_H_ */