--- trunk/xvidcore/vfw/src/resource.rc	2004/11/22 10:40:03	1562
+++ trunk/xvidcore/vfw/src/resource.rc	2005/01/16 10:23:53	1595
@@ -62,8 +62,6 @@
                     WS_TABSTOP,143,65,43,10
     EDITTEXT        IDC_FRAMEDROP,112,96,75,12,ES_AUTOHSCROLL | ES_NUMBER
     EDITTEXT        IDC_MAXKEY,112,116,76,12,ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "Cartoon Mode",IDC_CARTOON,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,13,143,61,10
     LTEXT           "Motion search precision:",IDC_STATIC,14,20,80,12,
                     SS_CENTERIMAGE
     LTEXT           "VHQ mode:",IDC_STATIC,14,39,38,8
@@ -72,7 +70,7 @@
     LTEXT           "Maximum I-frame interval:",IDC_STATIC,14,117,80,12,
                     SS_CENTERIMAGE
     GROUPBOX        "Motion Precision",IDC_STATIC,7,7,193,77
-    GROUPBOX        "Other",IDC_STATIC,7,79,193,84
+    GROUPBOX        "Other",IDC_STATIC,7,79,193,67
     CONTROL         "Use VHQ for bframes too",IDC_VHQ_BFRAME,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,14,52,95,10
 END
@@ -525,20 +523,17 @@
     LTEXT           "Profile @ Level:",IDC_STATIC,8,10,52,8
     COMBOBOX        IDC_PROFILE_PROFILE,84,8,116,76,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_QUANTTYPE,120,28,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    COMBOBOX        IDC_QUANTTYPE,111,32,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
-    PUSHBUTTON      "Edit Matrix...",IDC_QUANTMATRIX,120,43,76,12
+    PUSHBUTTON      "Edit Matrix...",IDC_QUANTMATRIX,111,47,76,12
     CONTROL         "Adaptive Quantization",IDC_LUMMASK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,16,50,85,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,16,56,85,10
     CONTROL         "Interlaced Encoding",IDC_INTERLACING,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,16,64,100,8
+                    BS_AUTOCHECKBOX | WS_TABSTOP,16,72,79,8
     CONTROL         "Quarter Pixel",IDC_QPEL,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,16,78,100,8
+                    WS_TABSTOP,16,88,100,8
     CONTROL         "Global Motion Compensation",IDC_GMC,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,16,92,103,8
-    CONTROL         "Reduced Resolution",IDC_REDUCED,"Button",
-                    BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,16,106,100,
-                    8
+                    BS_AUTOCHECKBOX | WS_TABSTOP,16,104,103,8
     CONTROL         "B-VOPs",IDC_BVOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
                     16,120,40,8
     LTEXT           "Max consecutive BVOPs:",IDC_MAXBFRAMES_S,16,136,96,8
@@ -547,13 +542,11 @@
     EDITTEXT        IDC_BQUANTOFFSET,120,161,76,12,ES_AUTOHSCROLL
     CONTROL         "Packed bitstream",IDC_PACKED,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,16,182,71,10
-    CONTROL         "Closed GOV",IDC_CLOSEDGOV,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,112,182,55,10
     LTEXT           "Quantizer ratio:",IDC_BQUANTRATIO_S,16,150,89,8
     LTEXT           "Quantizer offset:",IDC_BQUANTOFFSET_S,16,164,52,8
-    LTEXT           "Quantization type:",IDC_QUANTTYPE_S,16,32,100,8
+    LTEXT           "Quantization type:",IDC_QUANTTYPE_S,16,36,85,8
     CONTROL         "Top field first",IDC_TFF,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,119,62,56,10
+                    WS_TABSTOP,100,72,56,10
 END
 
 IDD_ZONE DIALOG DISCARDABLE  0, 0, 212, 194
@@ -584,6 +577,8 @@
     RTEXT           "X",IDC_ZONE_MAX,140,74,54,8
     LTEXT           "X",IDC_ZONE_MIN,18,74,54,8
     GROUPBOX        "Static",IDC_STATIC,7,107,198,80
+    CONTROL         "Cartoon Mode",IDC_CARTOON,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,121,124,61,10
 END
 
 IDD_LEVEL DIALOG DISCARDABLE  0, 0, 212, 215
@@ -885,7 +880,7 @@
 // TEXT
 //
 
-IDR_GPL                 TEXT    DISCARDABLE     "../../LICENSE"
+IDR_GPL                 TEXT    DISCARDABLE     "../LICENSE"
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////