--- trunk/xvidcore/dshow/src/config.c	2008/11/30 16:38:31	1827
+++ trunk/xvidcore/dshow/src/config.c	2011/02/14 16:59:16	1949
@@ -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.10 2008-11-30 16:36:44 Isibaar Exp $
+ * $Id: config.c,v 1.13 2011-02-14 16:59:16 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -54,6 +54,8 @@
 	REG_GET_N("Supported_4CC",  g_config.supported_4cc, 0)
 	REG_GET_N("Videoinfo_Compat",  g_config.videoinfo_compat, 0)
 	REG_GET_N("Decoder_Aspect_Ratio",  g_config.aspect_ratio, 0)
+	REG_GET_N("num_threads",  g_config.num_threads, 0)
+	REG_GET_N("cpu_flags", g_config.cpu, 0)
 
 	RegCloseKey(hKey);
 }
@@ -89,6 +91,7 @@
 	REG_SET_N("Supported_4CC",  g_config.supported_4cc);
 	REG_SET_N("Videoinfo_Compat",  g_config.videoinfo_compat);
 	REG_SET_N("Decoder_Aspect_Ratio", g_config.aspect_ratio);
+	REG_SET_N("num_threads",  g_config.num_threads);
 
 	RegCloseKey(hKey);
 }
@@ -141,7 +144,7 @@
 		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 (mpeg-4 first)"); 
+		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"); 
@@ -161,7 +164,7 @@
 
 		// 4CC checkbuttons
 		SendMessage(GetDlgItem(hwnd, IDC_DIVX), BM_SETCHECK, g_config.supported_4cc & SUPPORT_DIVX, 0);
-		SendMessage(GetDlgItem(hwnd, IDC_DX50), BM_SETCHECK, g_config.supported_4cc & SUPPORT_DX50, 0);
+		SendMessage(GetDlgItem(hwnd, IDC_3IVX), BM_SETCHECK, g_config.supported_4cc & SUPPORT_3IVX, 0);
 		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);
 
@@ -214,8 +217,8 @@
 		case IDC_DIVX:
 			g_config.supported_4cc ^= SUPPORT_DIVX;
 			break;
-		case IDC_DX50:
-			g_config.supported_4cc ^= SUPPORT_DX50;
+		case IDC_3IVX:
+			g_config.supported_4cc ^= SUPPORT_3IVX;
 			break;
 		case IDC_MP4V:
 			g_config.supported_4cc ^= SUPPORT_MP4V;