--- trunk/xvidcore/dshow/src/config.c	2004/07/11 10:22:47	1488
+++ trunk/xvidcore/dshow/src/config.c	2005/09/18 01:34:13	1636
@@ -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.c,v 1.5 2004-07-11 10:22:47 syskin Exp $
+ * $Id: config.c,v 1.8 2005-09-18 01:34:13 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -43,7 +43,7 @@
 	RegOpenKeyEx(XVID_REG_KEY, XVID_REG_SUBKEY, 0, KEY_READ, &hKey);
 
 	// Set the default post-processing settings
-	REG_GET_N("Brightness", g_config.nBrightness, 25)
+	REG_GET_N("Brightness", g_config.nBrightness, 0)
 	REG_GET_N("Deblock_Y",  g_config.nDeblock_Y, 0)
 	REG_GET_N("Deblock_UV", g_config.nDeblock_UV, 0)
 	REG_GET_N("Dering_Y",  g_config.nDering_Y, 0)
@@ -53,7 +53,7 @@
 	REG_GET_N("FlipVideo",  g_config.nFlipVideo, 0)
 	REG_GET_N("Supported_4CC",  g_config.supported_4cc, 0)
 	REG_GET_N("Videoinfo_Compat",  g_config.videoinfo_compat, 0)
-	REG_GET_N("Aspect_Ratio",  g_config.aspect_ratio, 0)
+	REG_GET_N("Decoder_Aspect_Ratio",  g_config.aspect_ratio, 0)
 
 	RegCloseKey(hKey);
 }
@@ -88,7 +88,7 @@
 	REG_SET_N("FlipVideo", g_config.nFlipVideo);
 	REG_SET_N("Supported_4CC",  g_config.supported_4cc);
 	REG_SET_N("Videoinfo_Compat",  g_config.videoinfo_compat);
-	REG_SET_N("Aspect_Ratio", g_config.aspect_ratio);
+	REG_SET_N("Decoder_Aspect_Ratio", g_config.aspect_ratio);
 
 	RegCloseKey(hKey);
 }
@@ -141,7 +141,8 @@
 		SendMessage(hBrightness, TBM_SETPOS, (WPARAM)TRUE, (LPARAM) g_config.nBrightness);
 
 		// Load Aspect Ratio Box
-		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"Auto"); 
+		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"Auto (mpeg-4 first)"); 
+		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"Auto (external first)"); 
 		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"4:3"); 
 		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"16:9"); 
 		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"2.35:1"); 
@@ -167,6 +168,7 @@
 		EnableWindow(GetDlgItem(hwnd,IDC_DERINGY),g_config.nDeblock_Y);
 		EnableWindow(GetDlgItem(hwnd,IDC_DERINGUV),g_config.nDeblock_UV);
 
+		EnableWindow(GetDlgItem(hwnd, IDC_USE_AR), !g_config.videoinfo_compat);
 
 		// Set Date & Time of Compilation
 		DPRINTF("(%s %s)", __DATE__, __TIME__);
@@ -226,6 +228,9 @@
 		}
 		EnableWindow(GetDlgItem(hwnd,IDC_DERINGY),g_config.nDeblock_Y);
 		EnableWindow(GetDlgItem(hwnd,IDC_DERINGUV),g_config.nDeblock_UV);
+
+		EnableWindow(GetDlgItem(hwnd, IDC_USE_AR), !g_config.videoinfo_compat);
+
 		SaveRegistryInfo();