--- branches/dev-api-4/xvidcore/vfw/src/config.c	2003/06/13 11:52:14	1069
+++ branches/dev-api-4/xvidcore/vfw/src/config.c	2003/10/28 23:42:09	1193
@@ -108,9 +108,9 @@
 {
 /*    name                 p@l,    w    h  fps  obj  Tvmv  vmv    vcv   ac%     vbv      pkt   kbps  flags */
     { "Simple @ L0",       0x08,  176, 144, 15,  1,  198,   99,   1485, 100,  10*16368,  2048,   64, 0 },
-            /* simple@l0: max f_code=1, intra_dc_vlc_threshold=0
-            /* if ac preidition is used, adaptive quantization must not be used */
-            /* <=qcif must be used */
+	/* simple@l0: max f_code=1, intra_dc_vlc_threshold=0 */
+	/* if ac preidition is used, adaptive quantization must not be used */
+	/* <=qcif must be used */
 	{ "Simple @ L1",       0x01,  176, 144, 15,  4,  198,   99,   1485, 100,  10*16368,  2048,   64, PROFILE_ADAPTQUANT },
 	{ "Simple @ L2",       0x02,  352, 288, 15,  4,  792,  396,   5940, 100,  40*16368,  4096,  128, PROFILE_ADAPTQUANT },
 	{ "Simple @ L3",       0x03,  352, 288, 15,  4,  792,  396,  11880, 100,  40*16368,  8192,  384, PROFILE_ADAPTQUANT },
@@ -192,6 +192,7 @@
     {"motion_search",			&reg.motion_search,				6},
 	{"vhq_mode",				&reg.vhq_mode,					0},
     {"chromame",				&reg.chromame,					0},
+    {"cartoon_mode",			&reg.cartoon_mode,				0},
 	{"max_key_interval",		&reg.max_key_interval,			300},
 	{"min_key_interval",		&reg.min_key_interval,			1},
 	{"frame_drop_ratio",		&reg.frame_drop_ratio,			0},	
@@ -823,6 +824,7 @@
 		SendDlgItemMessage(hDlg, IDC_MOTION, CB_SETCURSEL, config->motion_search, 0);
 		SendDlgItemMessage(hDlg, IDC_VHQ, CB_SETCURSEL, config->vhq_mode, 0);
         CheckDlg(hDlg, IDC_CHROMAME, config->chromame);
+        CheckDlg(hDlg, IDC_CARTOON, config->cartoon_mode);
 		SetDlgItemInt(hDlg, IDC_FRAMEDROP, config->frame_drop_ratio, FALSE);
 		SetDlgItemInt(hDlg, IDC_MAXKEY, config->max_key_interval, FALSE);
 		SetDlgItemInt(hDlg, IDC_MINKEY, config->min_key_interval, FALSE);
@@ -947,6 +949,7 @@
 		config->motion_search = SendDlgItemMessage(hDlg, IDC_MOTION, CB_GETCURSEL, 0, 0);
 		config->vhq_mode = SendDlgItemMessage(hDlg, IDC_VHQ, CB_GETCURSEL, 0, 0);
 		config->chromame = IsDlgChecked(hDlg, IDC_CHROMAME);
+		config->cartoon_mode = IsDlgChecked(hDlg, IDC_CARTOON);
 
         config->frame_drop_ratio = config_get_uint(hDlg, IDC_FRAMEDROP, config->frame_drop_ratio);
 
@@ -1388,7 +1391,6 @@
     case WM_NOTIFY :
         {
             NMHDR * n = (NMHDR*)lParam;
-            int idc = (int)wParam;
 
             if (n->code == NM_DBLCLK) {
                  NMLISTVIEW * nmlv = (NMLISTVIEW*) lParam;
@@ -1599,9 +1601,9 @@
 			info.version = XVID_VERSION;
 			xvid_global(0, XVID_GBL_INFO, &info, NULL);
 			wsprintf(core, "libxvidcore version %d.%d.%d (\"%s\")",
-				XVID_MAJOR(info.actual_version),
-				XVID_MINOR(info.actual_version),
-				XVID_PATCH(info.actual_version),
+				XVID_VERSION_MAJOR(info.actual_version),
+				XVID_VERSION_MINOR(info.actual_version),
+				XVID_VERSION_PATCH(info.actual_version),
 				info.build);
 
 			SetDlgItemText(hDlg, IDC_CORE, core);