--- trunk/xvidcore/dshow/src/config.c	2004/04/01 11:11:28	1397
+++ trunk/xvidcore/dshow/src/config.c	2004/04/18 07:55:11	1437
@@ -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.3 2004-04-01 11:11:28 suxen_drol Exp $
+ * $Id: config.c,v 1.4 2004-04-18 07:55:11 syskin Exp $
  *
  ****************************************************************************/
 
@@ -46,7 +46,8 @@
 	REG_GET_N("Brightness", g_config.nBrightness, 25)
 	REG_GET_N("Deblock_Y",  g_config.nDeblock_Y, 0)
 	REG_GET_N("Deblock_UV", g_config.nDeblock_UV, 0)
-	REG_GET_N("Dering",  g_config.nDering, 0)
+	REG_GET_N("Dering_Y",  g_config.nDering_Y, 0)
+	REG_GET_N("Dering_UV",  g_config.nDering_UV, 0)
 	REG_GET_N("FilmEffect", g_config.nFilmEffect, 0)
 	REG_GET_N("ForceColorspace", g_config.nForceColorspace, 0)
 	REG_GET_N("FlipVideo",  g_config.nFlipVideo, 0)
@@ -79,7 +80,8 @@
 	REG_SET_N("Brightness", g_config.nBrightness);
 	REG_SET_N("Deblock_Y",  g_config.nDeblock_Y);
 	REG_SET_N("Deblock_UV", g_config.nDeblock_UV);
-	REG_SET_N("Dering", g_config.nDering);
+	REG_SET_N("Dering_Y", g_config.nDering_Y);
+	REG_SET_N("Dering_UV", g_config.nDering_UV);
 	REG_SET_N("FilmEffect", g_config.nFilmEffect);
 	REG_SET_N("ForceColorspace", g_config.nForceColorspace);
 	REG_SET_N("FlipVideo", g_config.nFlipVideo);
@@ -130,7 +132,8 @@
 		// Load Buttons
 		SendMessage(GetDlgItem(hwnd, IDC_DEBLOCK_Y), BM_SETCHECK, g_config.nDeblock_Y, 0);
 		SendMessage(GetDlgItem(hwnd, IDC_DEBLOCK_UV), BM_SETCHECK, g_config.nDeblock_UV, 0);
-		SendMessage(GetDlgItem(hwnd, IDC_DERING), BM_SETCHECK, g_config.nDering, 0);
+		SendMessage(GetDlgItem(hwnd, IDC_DERINGY), BM_SETCHECK, g_config.nDering_Y, 0);
+		SendMessage(GetDlgItem(hwnd, IDC_DERINGUV), BM_SETCHECK, g_config.nDering_UV, 0);
 		SendMessage(GetDlgItem(hwnd, IDC_FILMEFFECT), BM_SETCHECK, g_config.nFilmEffect, 0);
 		SendMessage(GetDlgItem(hwnd, IDC_FLIPVIDEO), BM_SETCHECK, g_config.nFlipVideo, 0);
 
@@ -140,6 +143,9 @@
 		SendMessage(GetDlgItem(hwnd, IDC_MP4V), BM_SETCHECK, g_config.supported_4cc & SUPPORT_MP4V, 0);
 		SendMessage(GetDlgItem(hwnd, IDC_COMPAT), BM_SETCHECK, g_config.videoinfo_compat, 0);
 
+		EnableWindow(GetDlgItem(hwnd,IDC_DERINGY),g_config.nDeblock_Y);
+		EnableWindow(GetDlgItem(hwnd,IDC_DERINGUV),g_config.nDeblock_UV);
+
 		// Set Date & Time of Compilation
 		DPRINTF("(%s %s)", __DATE__, __TIME__);
 		break;
@@ -154,7 +160,8 @@
 			// Load Buttons
 			SendMessage(GetDlgItem(hwnd, IDC_DEBLOCK_Y), BM_SETCHECK, g_config.nDeblock_Y, 0);
 			SendMessage(GetDlgItem(hwnd, IDC_DEBLOCK_UV), BM_SETCHECK, g_config.nDeblock_UV, 0);
-			SendMessage(GetDlgItem(hwnd, IDC_DERING), BM_SETCHECK, g_config.nDering, 0);
+			SendMessage(GetDlgItem(hwnd, IDC_DERINGY), BM_SETCHECK, g_config.nDering_Y, 0);
+			SendMessage(GetDlgItem(hwnd, IDC_DERINGUV), BM_SETCHECK, g_config.nDering_UV, 0);
 			SendMessage(GetDlgItem(hwnd, IDC_FILMEFFECT), BM_SETCHECK, g_config.nFilmEffect, 0);
 			SendMessage(GetDlgItem(hwnd, IDC_FLIPVIDEO), BM_SETCHECK, g_config.nFlipVideo, 0);
 			g_config.nForceColorspace = 0;
@@ -167,8 +174,11 @@
 		case IDC_DEBLOCK_UV:
 			g_config.nDeblock_UV = !g_config.nDeblock_UV;
 			break;
-		case IDC_DERING:
-			g_config.nDering = !g_config.nDering;
+		case IDC_DERINGY:
+			g_config.nDering_Y = !g_config.nDering_Y;
+			break;
+		case IDC_DERINGUV:
+			g_config.nDering_UV = !g_config.nDering_UV;
 			break;
 		case IDC_FILMEFFECT:
 			g_config.nFilmEffect = !g_config.nFilmEffect;
@@ -191,7 +201,11 @@
 		default :
 			return FALSE;
 		}
+		EnableWindow(GetDlgItem(hwnd,IDC_DERINGY),g_config.nDeblock_Y);
+		EnableWindow(GetDlgItem(hwnd,IDC_DERINGUV),g_config.nDeblock_UV);
 		SaveRegistryInfo();
+		
+
 		break;
 	case WM_NOTIFY:
 		hBrightness = GetDlgItem(hwnd, IDC_BRIGHTNESS);