LinGui: tidy up how combobox values are handled internally and stored in plists

fix a problem with storing max picture dims to presets plist


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1719 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 12 insertions, 12 deletions

diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml
index 56827727b..46a78ff5f 100644
--- a/gtk/src/standard_presets.xml
+++ b/gtk/src/standard_presets.xml
@@ -72,7 +72,7 @@
 		<key>vquality_type_bitrate</key>
 		<true />
 		<key>x264_options</key>
-		<string>ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2</string>
+		<string>ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2</string>
 	</dict>
 	<key>AppleTV</key>
 	<dict>
@@ -154,7 +154,7 @@
 		<key>vquality_type_bitrate</key>
 		<true />
 		<key>x264_options</key>
-		<string>bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=1:cabac=0</string>
+		<string>bframes=3:ref=1:me=umh:no-fast-pskip=1:trellis=1:cabac=0</string>
 	</dict>
 	<key>Bedlam</key>
 	<dict>
@@ -370,7 +370,7 @@
 		<key>vquality_type_target</key>
 		<true />
 		<key>x264_options</key>
-		<string>ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:direct=auto:me=umh:subme=6:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>
+		<string>ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:direct=auto:me=umh:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>
 	</dict>
 	<key>Classic</key>
 	<dict>
@@ -512,7 +512,7 @@
 		<key>vquality_type_constant</key>
 		<true />
 		<key>x264_options</key>
-		<string>ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:subme=6:trellis=1:analyse=all:8x8dct:me=umh</string>
+		<string>ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:trellis=1:analyse=all:8x8dct:me=umh</string>
 	</dict>
 	<key>Deux Six Quatre</key>
 	<dict>
@@ -728,7 +728,7 @@
 		<key>vquality_type_bitrate</key>
 		<true />
 		<key>x264_options</key>
-		<string>ref=2:bframes=2:subme=5:me=umh</string>
+		<string>ref=2:bframes=2:me=umh</string>
 	</dict>
 	<key>PS3</key>
 	<dict>
@@ -796,7 +796,7 @@
 		<key>vquality_type_bitrate</key>
 		<true />
 		<key>x264_options</key>
-		<string>level=41:subme=5:me=umh</string>
+		<string>level=41:me=umh</string>
 	</dict>
 	<key>PSP</key>
 	<dict>
@@ -938,7 +938,7 @@
 		<key>vquality_type_bitrate</key>
 		<true />
 		<key>x264_options</key>
-		<string>ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:subme=5:analyse=all:trellis=1:no-fast-pskip</string>
+		<string>ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:analyse=all:trellis=1:no-fast-pskip</string>
 	</dict>
 	<key>Television</key>
 	<dict>
@@ -1010,7 +1010,7 @@
 		<key>vquality_type_bitrate</key>
 		<true />
 		<key>x264_options</key>
-		<string>ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:subme=6:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip</string>
+		<string>ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip</string>
 	</dict>
 	<key>Xbox 360</key>
 	<dict>
@@ -1078,7 +1078,7 @@
 		<key>vquality_type_bitrate</key>
 		<true />
 		<key>x264_options</key>
-		<string>level=40:ref=2:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:no-fast-pskip:filter=-2,-1</string>
+		<string>level=40:ref=2:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1</string>
 	</dict>
 	<key>iPhone / iPod Touch</key>
 	<dict>
@@ -1150,7 +1150,7 @@
 		<key>vquality_type_bitrate</key>
 		<true />
 		<key>x264_options</key>
-		<string>level=30:cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1</string>
+		<string>level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:trellis=1</string>
 	</dict>
 	<key>iPod High-Rez</key>
 	<dict>
@@ -1222,7 +1222,7 @@
 		<key>vquality_type_bitrate</key>
 		<true />
 		<key>x264_options</key>
-		<string>level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1</string>
+		<string>level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1</string>
 	</dict>
 	<key>iPod Low-Rez</key>
 	<dict>
@@ -1294,7 +1294,7 @@
 		<key>vquality_type_bitrate</key>
 		<true />
 		<key>x264_options</key>
-		<string>level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1</string>
+		<string>level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1</string>
 	</dict>
 </dict>
 </plist>