--- trunk/xvidcore/vfw/src/resource.rc	2010/12/21 16:56:42	1914
+++ branches/release-1_3-branch/xvidcore/vfw/src/resource.rc	2011/01/03 08:31:22	1940
@@ -19,8 +19,10 @@
 // Neutral resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
+#ifdef _WIN32
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #pragma code_page(1252)
+#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -331,14 +333,14 @@
 CAPTION "Profile"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    GROUPBOX        "",IDC_STATIC,8,144,198,69
+    GROUPBOX        "",IDC_STATIC,8,145,198,68
     COMBOBOX        IDC_PROFILE_PROFILE,72,21,128,200,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_QUANTTYPE,124,47,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Edit Matrix...",IDC_QUANTMATRIX,124,62,76,12
-    CONTROL         "Interlaced Encoding",IDC_INTERLACING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,97,79,8
-    CONTROL         "Quarter Pixel",IDC_QPEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,113,100,8
-    CONTROL         "Global Motion Compensation",IDC_GMC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,129,103,8
-    CONTROL         "B-VOPs",IDC_BVOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,145,40,8
+    PUSHBUTTON      "Edit Matrix...",IDC_QUANTMATRIX,124,62,76,10
+    CONTROL         "Interlaced Encoding",IDC_INTERLACING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,94,79,8
+    CONTROL         "Quarter Pixel",IDC_QPEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,106,100,8
+    CONTROL         "Global Motion Compensation",IDC_GMC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,118,103,8
+    CONTROL         "B-VOPs",IDC_BVOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,146,40,8
     LTEXT           "Max consecutive BVOPs:",IDC_MAXBFRAMES_S,16,158,96,8
     EDITTEXT        IDC_MAXBFRAMES,124,155,76,12,ES_AUTOHSCROLL | ES_NUMBER
     EDITTEXT        IDC_BQUANTRATIO,124,169,76,12,ES_AUTOHSCROLL
@@ -347,13 +349,14 @@
     LTEXT           "Quantizer ratio:",IDC_BQUANTRATIO_S,16,172,89,8
     LTEXT           "Quantizer offset:",IDC_BQUANTOFFSET_S,16,186,52,8
     LTEXT           "Quantization type:",IDC_QUANTTYPE_S,16,50,85,8
-    CONTROL         "Top field first",IDC_TFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,97,56,10
-    COMBOBOX        IDC_LUMMASK,124,78,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Adaptive Quantization:",IDC_LUMMASK_S,16,80,86,8
+    CONTROL         "Top field first",IDC_TFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,94,56,10
+    COMBOBOX        IDC_LUMMASK,124,75,76,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Adaptive Quantization:",IDC_LUMMASK_S,16,77,86,8
     GROUPBOX        "",IDC_STATIC,4,7,202,37
     LTEXT           "Profile",IDC_STATIC,9,6,22,8
     ICON            IDI_MOBILE,IDC_PROFILE_LOGO,10,15,20,20,SS_REALSIZEIMAGE,WS_EX_ACCEPTFILES
     LTEXT           "Profile @ Level:",IDC_PROFILE_LABEL,11,23,52,8,NOT WS_VISIBLE
+    CONTROL         "Independent Slice Coding",IDC_SLICES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,130,103,8
 END
 
 IDD_ZONE DIALOG 0, 0, 212, 194
@@ -590,7 +593,7 @@
 // Bitmap
 //
 
-IDB_LOGO                BITMAP                  "C:\\workspace\\xvidcore_head\\vfw\\src\\XviD_logo.bmp"
+IDB_LOGO                BITMAP                  "XviD_logo.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -828,17 +831,6 @@
     IDC_ZONE_FORCEIVOP      "Force a keyframe at the beginnig of the zone"
 END
 
-#endif    // Neutral resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Deutsch (Deutschland) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-#pragma code_page(1252)
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
@@ -850,7 +842,7 @@
 IDI_HOME                ICON                    "home_40.ico"
 IDI_HD1080              ICON                    "hd1080_40.ico"
 IDI_HD720               ICON                    "hd720_40.ico"
-#endif    // Deutsch (Deutschland) resources
+#endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////