--- branches/dev-api-4/xvidcore/vfw/src/config.c	2003/12/18 14:51:40	1277
+++ branches/dev-api-4/xvidcore/vfw/src/config.c	2003/12/20 19:13:24	1289
@@ -129,14 +129,12 @@
 	{ "AS @ L5",	       0xf5,  720, 576, 30,  4, 4860, 1620,  48600,  25, 112*16368, 16384, 8000, PROFILE_AS },
 
 #ifdef DXN_PROFILES
-
 	{ "DXN Handheld",	   0x00,  176, 144, 15, -1,  198,   99,   1485, 100,  16*16368,    -1,  128, PROFILE_ADAPTQUANT },
 	{ "DXN Portable NTSC", 0x00,  352, 240, 30, -1,  990,  330,   9900, 100,  64*16368,    -1,  768, PROFILE_ADAPTQUANT|PROFILE_BVOP },
 	{ "DXN Portable PAL",  0x00,  352, 288, 25, -1, 1188,  396,   9900, 100,  64*16368,    -1,  768, PROFILE_ADAPTQUANT|PROFILE_BVOP },
 	{ "DXN HT NTSC",	   0x00,  720, 480, 30, -1, 4050, 1350,  40500, 100, 192*16368,    -1, 4000, PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_INTERLACE },
 	{ "DXN HT PAL",        0x00,  720, 576, 25, -1, 4860, 1620,  40500, 100, 192*16368,    -1, 4000, PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_INTERLACE },
 	{ "DXN HDTV",          0x00, 1280, 720, 30, -1,10800, 3600, 108000, 100, 384*16368,    -1, 8000, PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_INTERLACE },
-
 #endif
 
     { "(unrestricted)",    0x00,    0,   0,  0,  0,    0,    0,      0, 100,   0*16368,     0,    0, 0xffffffff },
@@ -163,11 +161,11 @@
 	{"qpel",					&reg.qpel,						0},
 	{"gmc",						&reg.gmc,						0},
 	{"reduced_resolution",		&reg.reduced_resolution,		0},
-    {"use_bvop",				&reg.use_bvop,	    			0},
+    {"use_bvop",				&reg.use_bvop,	    			1},
 	{"max_bframes",				&reg.max_bframes,				2},
 	{"bquant_ratio",			&reg.bquant_ratio,				150},   /* 100-base float */
 	{"bquant_offset",			&reg.bquant_offset,				100},   /* 100-base float */
-	{"packed",					&reg.packed,					0},
+	{"packed",					&reg.packed,					1},
 	{"closed_gov",				&reg.closed_gov,				1},
 	
 	/* aspect ratio */
@@ -201,8 +199,8 @@
 
     /* motion */
     {"motion_search",			&reg.motion_search,				6},
-	{"vhq_mode",				&reg.vhq_mode,					0},
-    {"chromame",				&reg.chromame,					0},
+	{"vhq_mode",				&reg.vhq_mode,					1},
+    {"chromame",				&reg.chromame,					1},
     {"cartoon_mode",			&reg.cartoon_mode,				0},
 	{"max_key_interval",		&reg.max_key_interval,			300},
 	{"frame_drop_ratio",		&reg.frame_drop_ratio,			0},	
@@ -742,8 +740,10 @@
 		}
 		
 		ar_mode = IsDlgChecked(hDlg, IDC_AR);
-		SetDlgItemInt(hDlg, IDC_ARX, config->ar_x, FALSE);
-		SetDlgItemInt(hDlg, IDC_ARY, config->ar_y, FALSE);
+
+		config->ar_x = config_get_uint(hDlg, IDC_ARX, config->ar_x);
+		config->ar_y = config_get_uint(hDlg, IDC_ARY, config->ar_y);
+
 		EnableDlgWindow(hDlg, IDC_ARX, ar_mode);
 		EnableDlgWindow(hDlg, IDC_ARY, ar_mode);
 		break;
@@ -822,6 +822,8 @@
 	case IDD_AR:
 		CheckRadioButton(hDlg, IDC_AR, IDC_PAR, config->ar_mode == 0 ? IDC_PAR : IDC_AR);
 		SendDlgItemMessage(hDlg, IDC_ASPECT_RATIO, CB_SETCURSEL, (config->display_aspect_ratio), 0);
+		SetDlgItemInt(hDlg, IDC_ARX, config->ar_x, FALSE);
+		SetDlgItemInt(hDlg, IDC_ARY, config->ar_y, FALSE);
 		break;
 
     case IDD_LEVEL :
@@ -1127,7 +1129,31 @@
                 SetDlgItemInt(hDlg, IDC_ZONE_FRAME, psi->config->ci.ciActiveFrame, FALSE);
                 break;
 
-            default :
+			case IDC_AR_DEFAULT:
+				CheckRadioButton(hDlg, IDC_AR, IDC_PAR, IDC_PAR);
+				SendDlgItemMessage(hDlg, IDC_ASPECT_RATIO, CB_SETCURSEL, 0, 0);
+				adv_mode(hDlg, psi->idd, psi->config);
+				break;
+			case IDC_AR_4_3:
+				SetDlgItemInt(hDlg, IDC_ARX, 4, FALSE);
+				SetDlgItemInt(hDlg, IDC_ARY, 3, FALSE);
+				CheckRadioButton(hDlg, IDC_AR, IDC_PAR, IDC_AR);
+				adv_mode(hDlg, psi->idd, psi->config);
+				break;
+			case IDC_AR_16_9:
+				SetDlgItemInt(hDlg, IDC_ARX, 16, FALSE);
+				SetDlgItemInt(hDlg, IDC_ARY, 9, FALSE);
+				CheckRadioButton(hDlg, IDC_AR, IDC_PAR, IDC_AR);
+				adv_mode(hDlg, psi->idd, psi->config);
+				break;
+			case IDC_AR_235_100:
+				SetDlgItemInt(hDlg, IDC_ARX, 235, FALSE);
+				SetDlgItemInt(hDlg, IDC_ARY, 100, FALSE);
+				CheckRadioButton(hDlg, IDC_AR, IDC_PAR, IDC_AR);
+				adv_mode(hDlg, psi->idd, psi->config);
+				break;
+
+			default :
                 return TRUE;
             }
 		}else if (HIWORD(wParam) == LBN_SELCHANGE &&