LinGui: accomodate new x264 defaults

- presets updated so that they behave as they did before defaults change
- added subme 10 option


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

3 files changed, 993 insertions, 983 deletions

diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 4aa1351a8..65f553f47 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -300,6 +300,7 @@ static options_map_t d_subme_opts[] =
 	{"7", "7", 7, "7"},
 	{"8", "8", 8, "8"},
 	{"9", "9", 9, "9"},
+	{"10", "10", 10, "10"},
 };
 combo_opts_t subme_opts =
 {
diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml
index 1192a2e56..1f8e8c980 100644
--- a/gtk/src/standard_presets.xml
+++ b/gtk/src/standard_presets.xml
@@ -1,976 +1,975 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">

-<plist version="1.0">

-<array>

-	<dict>

-		<key>ChildrenArray</key>

-		<array>

-			<dict>

-				<key>AudioList</key>

-				<array>

-					<dict>

-						<key>AudioBitrate</key>

-						<string>160</string>

-						<key>AudioEncoder</key>

-						<string>AAC (faac)</string>

-						<key>AudioMixdown</key>

-						<string>Dolby Pro Logic II</string>

-						<key>AudioSamplerate</key>

-						<string>48</string>

-						<key>AudioTrack</key>

-						<integer>1</integer>

-						<key>AudioTrackDRCSlider</key>

-						<real>0.0</real>

-					</dict>

-					<dict>

-						<key>AudioBitrate</key>

-						<string>160</string>

-						<key>AudioEncoder</key>

-						<string>AC3 Passthru</string>

-						<key>AudioMixdown</key>

-						<string>AC3 Passthru</string>

-						<key>AudioSamplerate</key>

-						<string>Auto</string>

-						<key>AudioTrack</key>

-						<integer>1</integer>

-						<key>AudioTrackDRCSlider</key>

-						<real>0.0</real>

-					</dict>

-				</array>

-				<key>ChapterMarkers</key>

-				<integer>1</integer>

-				<key>Default</key>

-				<integer>0</integer>

-				<key>FileFormat</key>

-				<string>MP4 file</string>

-				<key>Folder</key>

-				<false/>

-				<key>Mp4LargeFile</key>

-				<integer>0</integer>

-				<key>PictureAutoCrop</key>

-				<integer>1</integer>

-				<key>PictureBottomCrop</key>

-				<integer>0</integer>

-				<key>PictureDeblock</key>

-				<integer>0</integer>

-				<key>PictureDeinterlace</key>

-				<integer>0</integer>

-				<key>PictureDenoise</key>

-				<integer>0</integer>

-				<key>PictureDetelecine</key>

-				<integer>0</integer>

-				<key>PictureHeight</key>

-				<integer>0</integer>

-				<key>PictureKeepRatio</key>

-				<integer>0</integer>

-				<key>PictureLeftCrop</key>

-				<integer>0</integer>

-				<key>PicturePAR</key>

-				<integer>2</integer>

-				<key>PictureRightCrop</key>

-				<integer>0</integer>

-				<key>PictureTopCrop</key>

-				<integer>0</integer>

-				<key>PictureWidth</key>

-				<integer>720</integer>

-				<key>PresetDescription</key>

-				<string>HandBrake's universally compatible, full resolution settings for all current Apple devices: iPod (6G and up), iPhone, AppleTV, and Macs</string>

-				<key>PresetName</key>

-				<string>Universal</string>

-				<key>Subtitles</key>

-				<string>None</string>

-				<key>Type</key>

-				<integer>0</integer>

-				<key>UsesPictureFilters</key>

-				<integer>1</integer>

-				<key>UsesPictureSettings</key>

-				<integer>1</integer>

-				<key>VFR</key>

-				<integer>0</integer>

-				<key>VideoAvgBitrate</key>

-				<string>2500</string>

-				<key>VideoEncoder</key>

-				<string>H.264 (x264)</string>

-				<key>VideoFramerate</key>

-				<string>Same as source</string>

-				<key>VideoGrayScale</key>

-				<integer>0</integer>

-				<key>VideoQualitySlider</key>

-				<real>20</real>

-				<key>VideoQualityType</key>

-				<integer>2</integer>

-				<key>VideoTargetSize</key>

-				<string>700</string>

-				<key>VideoTwoPass</key>

-				<integer>0</integer>

-				<key>x264Option</key>

-				<string>cabac=0:ref=2:mixed-refs=1:me=umh</string>

-			</dict>

-			<dict>

-				<key>AudioList</key>

-				<array>

-					<dict>

-						<key>AudioBitrate</key>

-						<string>160</string>

-						<key>AudioEncoder</key>

-						<string>AAC (faac)</string>

-						<key>AudioMixdown</key>

-						<string>Dolby Pro Logic II</string>

-						<key>AudioSamplerate</key>

-						<string>48</string>

-						<key>AudioTrack</key>

-						<integer>1</integer>

-						<key>AudioTrackDRCSlider</key>

-						<real>0.0</real>

-					</dict>

-				</array>

-				<key>ChapterMarkers</key>

-				<integer>1</integer>

-				<key>Default</key>

-				<integer>0</integer>

-				<key>FileFormat</key>

-				<string>MP4 file</string>

-				<key>Mp4iPodCompatible</key>

-				<integer>1</integer>

-				<key>PictureAutoCrop</key>

-				<integer>1</integer>

-				<key>PictureBottomCrop</key>

-				<integer>0</integer>

-				<key>PictureDeblock</key>

-				<integer>0</integer>

-				<key>PictureDeinterlace</key>

-				<integer>0</integer>

-				<key>PictureDenoise</key>

-				<integer>0</integer>

-				<key>PictureDetelecine</key>

-				<integer>0</integer>

-				<key>PictureHeight</key>

-				<integer>0</integer>

-				<key>PictureKeepRatio</key>

-				<integer>1</integer>

-				<key>PictureLeftCrop</key>

-				<integer>0</integer>

-				<key>PicturePAR</key>

-				<integer>0</integer>

-				<key>PictureRightCrop</key>

-				<integer>0</integer>

-				<key>PictureTopCrop</key>

-				<integer>0</integer>

-				<key>PictureWidth</key>

-				<integer>320</integer>

-				<key>PresetDescription</key>

-				<string>HandBrake's low resolution settings for the iPod (5G and up). Optimized for great playback on the iPod screen, with smaller file size.</string>

-				<key>PresetName</key>

-				<string>iPod</string>

-				<key>Subtitles</key>

-				<string>None</string>

-				<key>Type</key>

-				<integer>0</integer>

-				<key>UsesMaxPictureSettings</key>

-				<integer>0</integer>

-				<key>UsesPictureFilters</key>

-				<integer>1</integer>

-				<key>UsesPictureSettings</key>

-				<integer>1</integer>

-				<key>VFR</key>

-				<integer>0</integer>

-				<key>VideoAvgBitrate</key>

-				<string>700</string>

-				<key>VideoEncoder</key>

-				<string>H.264 (x264)</string>

-				<key>VideoFramerate</key>

-				<string>Same as source</string>

-				<key>VideoGrayScale</key>

-				<integer>0</integer>

-				<key>VideoQualitySlider</key>

-				<real>0.64709997177124023</real>

-				<key>VideoQualityType</key>

-				<integer>1</integer>

-				<key>VideoTargetSize</key>

-				<string>700</string>

-				<key>VideoTwoPass</key>

-				<integer>0</integer>

-				<key>x264Option</key>

-				<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>

-				<key>AudioList</key>

-				<array>

-					<dict>

-						<key>AudioBitrate</key>

-						<string>128</string>

-						<key>AudioEncoder</key>

-						<string>AAC (faac)</string>

-						<key>AudioMixdown</key>

-						<string>Dolby Pro Logic II</string>

-						<key>AudioSamplerate</key>

-						<string>48</string>

-						<key>AudioTrack</key>

-						<integer>1</integer>

-						<key>AudioTrackDRCSlider</key>

-						<real>0.0</real>

-					</dict>

-				</array>

-				<key>ChapterMarkers</key>

-				<integer>1</integer>

-				<key>Default</key>

-				<integer>0</integer>

-				<key>FileFormat</key>

-				<string>MP4 file</string>

-				<key>Mp4iPodCompatible</key>

-				<integer>0</integer>

-				<key>PictureAutoCrop</key>

-				<integer>1</integer>

-				<key>PictureBottomCrop</key>

-				<integer>0</integer>

-				<key>PictureDeblock</key>

-				<integer>0</integer>

-				<key>PictureDeinterlace</key>

-				<integer>0</integer>

-				<key>PictureDenoise</key>

-				<integer>0</integer>

-				<key>PictureDetelecine</key>

-				<integer>0</integer>

-				<key>PictureHeight</key>

-				<integer>0</integer>

-				<key>PictureKeepRatio</key>

-				<integer>1</integer>

-				<key>PictureLeftCrop</key>

-				<integer>0</integer>

-				<key>PicturePAR</key>

-				<integer>0</integer>

-				<key>PictureRightCrop</key>

-				<integer>0</integer>

-				<key>PictureTopCrop</key>

-				<integer>0</integer>

-				<key>PictureWidth</key>

-				<integer>480</integer>

-				<key>PresetDescription</key>

-				<string>HandBrake's settings for the iPhone and iPod Touch.</string>

-				<key>PresetName</key>

-				<string>iPhone &amp; iPod Touch</string>

-				<key>Subtitles</key>

-				<string>None</string>

-				<key>Type</key>

-				<integer>0</integer>

-				<key>UsesMaxPictureSettings</key>

-				<integer>0</integer>

-				<key>UsesPictureFilters</key>

-				<integer>1</integer>

-				<key>UsesPictureSettings</key>

-				<integer>1</integer>

-				<key>VFR</key>

-				<integer>0</integer>

-				<key>VideoAvgBitrate</key>

-				<string>960</string>

-				<key>VideoEncoder</key>

-				<string>H.264 (x264)</string>

-				<key>VideoFramerate</key>

-				<string>Same as source</string>

-				<key>VideoGrayScale</key>

-				<integer>0</integer>

-				<key>VideoQualitySlider</key>

-				<real>20</real>

-				<key>VideoQualityType</key>

-				<integer>2</integer>

-				<key>VideoTargetSize</key>

-				<string>700</string>

-				<key>VideoTwoPass</key>

-				<integer>0</integer>

-				<key>x264Option</key>

-				<string>cabac=0:ref=2:mixed-refs:me=umh</string>

-			</dict>

-			<dict>

-				<key>AudioList</key>

-				<array>

-					<dict>

-						<key>AudioBitrate</key>

-						<string>160</string>

-						<key>AudioEncoder</key>

-						<string>AAC (faac)</string>

-						<key>AudioMixdown</key>

-						<string>Dolby Pro Logic II</string>

-						<key>AudioSamplerate</key>

-						<string>48</string>

-						<key>AudioTrack</key>

-						<integer>1</integer>

-						<key>AudioTrackDRCSlider</key>

-						<real>0.0</real>

-					</dict>

-					<dict>

-						<key>AudioBitrate</key>

-						<string>160</string>

-						<key>AudioEncoder</key>

-						<string>AC3 Passthru</string>

-						<key>AudioMixdown</key>

-						<string>AC3 Passthru</string>

-						<key>AudioSamplerate</key>

-						<string>Auto</string>

-						<key>AudioTrack</key>

-						<integer>1</integer>

-						<key>AudioTrackDRCSlider</key>

-						<real>0.0</real>

-					</dict>

-				</array>

-				<key>ChapterMarkers</key>

-				<integer>1</integer>

-				<key>Default</key>

-				<integer>0</integer>

-				<key>FileFormat</key>

-				<string>MP4 file</string>

-				<key>Folder</key>

-				<false/>

-				<key>Mp4LargeFile</key>

-				<integer>1</integer>

-				<key>PictureAutoCrop</key>

-				<integer>1</integer>

-				<key>PictureBottomCrop</key>

-				<integer>0</integer>

-				<key>PictureDeblock</key>

-				<integer>0</integer>

-				<key>PictureDeinterlace</key>

-				<integer>0</integer>

-				<key>PictureDenoise</key>

-				<integer>0</integer>

-				<key>PictureDetelecine</key>

-				<integer>0</integer>

-				<key>PictureHeight</key>

-				<integer>0</integer>

-				<key>PictureKeepRatio</key>

-				<integer>0</integer>

-				<key>PictureLeftCrop</key>

-				<integer>0</integer>

-				<key>PicturePAR</key>

-				<integer>2</integer>

-				<key>PictureRightCrop</key>

-				<integer>0</integer>

-				<key>PictureTopCrop</key>

-				<integer>0</integer>

-				<key>PictureWidth</key>

-				<integer>960</integer>

-				<key>PresetDescription</key>

-				<string>HandBrake's settings for the AppleTV, including Dolby Digital 5.1 AC3 sound. Provides a good balance between quality and file size, and pushes the AppleTV to its limits.</string>

-				<key>PresetName</key>

-				<string>AppleTV</string>

-				<key>Subtitles</key>

-				<string>None</string>

-				<key>Type</key>

-				<integer>0</integer>

-				<key>UsesPictureFilters</key>

-				<integer>1</integer>

-				<key>UsesPictureSettings</key>

-				<integer>1</integer>

-				<key>VFR</key>

-				<integer>0</integer>

-				<key>VideoAvgBitrate</key>

-				<string>2500</string>

-				<key>VideoEncoder</key>

-				<string>H.264 (x264)</string>

-				<key>VideoFramerate</key>

-				<string>Same as source</string>

-				<key>VideoGrayScale</key>

-				<integer>0</integer>

-				<key>VideoQualitySlider</key>

-				<real>20</real>

-				<key>VideoQualityType</key>

-				<integer>2</integer>

-				<key>VideoTargetSize</key>

-				<string>700</string>

-				<key>VideoTwoPass</key>

-				<integer>0</integer>

-				<key>x264Option</key>

-				<string>cabac=0:ref=2:mixed-refs=1:bframes=3:me=umh:subme=7:b-adapt=2:8x8dct=1</string>

-			</dict>

-		</array>

-		<key>Default</key>

-		<integer>0</integer>

-		<key>Folder</key>

-		<true/>

-		<key>PresetBuildNumber</key>

-		<integer>2009060401</integer>

-		<key>PresetName</key>

-		<string>Apple</string>

-		<key>Type</key>

-		<integer>0</integer>

-	</dict>

-	<dict>

-		<key>ChildrenArray</key>

-		<array>

-			<dict>

-				<key>AudioList</key>

-				<array>

-					<dict>

-						<key>AudioBitrate</key>

-						<string>160</string>

-						<key>AudioEncoder</key>

-						<string>AAC (faac)</string>

-						<key>AudioMixdown</key>

-						<string>Dolby Pro Logic II</string>

-						<key>AudioSamplerate</key>

-						<string>48</string>

-						<key>AudioTrack</key>

-						<integer>1</integer>

-						<key>AudioTrackDRCSlider</key>

-						<real>0.0</real>

-					</dict>

-				</array>

-				<key>ChapterMarkers</key>

-				<integer>1</integer>

-				<key>Default</key>

-				<integer>1</integer>

-				<key>FileFormat</key>

-				<string>MP4 file</string>

-				<key>PictureAutoCrop</key>

-				<integer>1</integer>

-				<key>PictureBottomCrop</key>

-				<integer>0</integer>

-				<key>PictureDeblock</key>

-				<integer>0</integer>

-				<key>PictureDeinterlace</key>

-				<integer>0</integer>

-				<key>PictureDenoise</key>

-				<integer>0</integer>

-				<key>PictureDetelecine</key>

-				<integer>0</integer>

-				<key>PictureHeight</key>

-				<integer>0</integer>

-				<key>PictureKeepRatio</key>

-				<integer>0</integer>

-				<key>PictureLeftCrop</key>

-				<integer>0</integer>

-				<key>PicturePAR</key>

-				<integer>1</integer>

-				<key>PictureRightCrop</key>

-				<integer>0</integer>

-				<key>PictureTopCrop</key>

-				<integer>0</integer>

-				<key>PictureWidth</key>

-				<integer>0</integer>

-				<key>PresetDescription</key>

-				<string>HandBrake's normal, default settings.</string>

-				<key>PresetName</key>

-				<string>Normal</string>

-				<key>Subtitles</key>

-				<string>None</string>

-				<key>Type</key>

-				<integer>0</integer>

-				<key>UsesMaxPictureSettings</key>

-				<integer>1</integer>

-				<key>UsesPictureFilters</key>

-				<integer>1</integer>

-				<key>UsesPictureSettings</key>

-				<integer>1</integer>

-				<key>VFR</key>

-				<integer>0</integer>

-				<key>VideoAvgBitrate</key>

-				<string>1500</string>

-				<key>VideoEncoder</key>

-				<string>H.264 (x264)</string>

-				<key>VideoFramerate</key>

-				<string>Same as source</string>

-				<key>VideoGrayScale</key>

-				<integer>0</integer>

-				<key>VideoQualitySlider</key>

-				<real>20</real>

-				<key>VideoQualityType</key>

-				<integer>2</integer>

-				<key>VideoTargetSize</key>

-				<string>700</string>

-				<key>VideoTurboTwoPass</key>

-				<integer>0</integer>

-				<key>VideoTwoPass</key>

-				<integer>0</integer>

-				<key>x264Option</key>

-				<string>ref=2:bframes=2:me=umh</string>

-			</dict>

-			<dict>

-				<key>AudioList</key>

-				<array>

-					<dict>

-						<key>AudioBitrate</key>

-						<string>160</string>

-						<key>AudioEncoder</key>

-						<string>AAC (faac)</string>

-						<key>AudioMixdown</key>

-						<string>Dolby Pro Logic II</string>

-						<key>AudioSamplerate</key>

-						<string>48</string>

-						<key>AudioTrack</key>

-						<integer>1</integer>

-						<key>AudioTrackDRCSlider</key>

-						<real>0.0</real>

-					</dict>

-					<dict>

-						<key>AudioBitrate</key>

-						<string>160</string>

-						<key>AudioEncoder</key>

-						<string>AC3 Passthru</string>

-						<key>AudioMixdown</key>

-						<string>AC3 Passthru</string>

-						<key>AudioSamplerate</key>

-						<string>Auto</string>

-						<key>AudioTrack</key>

-						<integer>1</integer>

-						<key>AudioTrackDRCSlider</key>

-						<real>0.0</real>

-					</dict>

-				</array>

-				<key>ChapterMarkers</key>

-				<integer>1</integer>

-				<key>Default</key>

-				<integer>0</integer>

-				<key>FileFormat</key>

-				<string>MP4 file</string>

-				<key>PictureAutoCrop</key>

-				<integer>1</integer>

-				<key>PictureBottomCrop</key>

-				<integer>0</integer>

-				<key>PictureDeblock</key>

-				<integer>0</integer>

-				<key>PictureDecomb</key>

-				<integer>1</integer>

-				<key>PictureDeinterlace</key>

-				<integer>0</integer>

-				<key>PictureDenoise</key>

-				<integer>0</integer>

-				<key>PictureDetelecine</key>

-				<integer>1</integer>

-				<key>PictureHeight</key>

-				<integer>0</integer>

-				<key>PictureKeepRatio</key>

-				<integer>0</integer>

-				<key>PictureLeftCrop</key>

-				<integer>0</integer>

-				<key>PicturePAR</key>

-				<integer>2</integer>

-				<key>PictureRightCrop</key>

-				<integer>0</integer>

-				<key>PictureTopCrop</key>

-				<integer>0</integer>

-				<key>PictureWidth</key>

-				<integer>0</integer>

-				<key>PresetDescription</key>

-				<string>HandBrake's general-purpose preset for High Profile H.264 video, with all the bells and whistles.</string>

-				<key>PresetName</key>

-				<string>High Profile</string>

-				<key>Subtitles</key>

-				<string>None</string>

-				<key>Type</key>

-				<integer>0</integer>

-				<key>UsesMaxPictureSettings</key>

-				<integer>1</integer>

-				<key>UsesPictureFilters</key>

-				<integer>1</integer>

-				<key>UsesPictureSettings</key>

-				<integer>1</integer>

-				<key>VideoAvgBitrate</key>

-				<string>1800</string>

-				<key>VideoEncoder</key>

-				<string>H.264 (x264)</string>

-				<key>VideoFramerate</key>

-				<string>Same as source</string>

-				<key>VideoGrayScale</key>

-				<integer>0</integer>

-				<key>VideoQualitySlider</key>

-				<real>20</real>

-				<key>VideoQualityType</key>

-				<integer>2</integer>

-				<key>VideoTargetSize</key>

-				<string>700</string>

-				<key>VideoTurboTwoPass</key>

-				<integer>0</integer>

-				<key>VideoTwoPass</key>

-				<integer>0</integer>

-				<key>x264Option</key>

-				<string>ref=3:mixed-refs:bframes=3:weightb:b-pyramid:b-adapt=2:me=umh:subme=9:analyse=all:8x8dct</string>

-			</dict>

-		</array>

-		<key>Default</key>

-		<integer>0</integer>

-		<key>Folder</key>

-		<true/>

-		<key>PresetBuildNumber</key>

-		<integer>2009060401</integer>

-		<key>PresetName</key>

-		<string>Regular</string>

-		<key>Type</key>

-		<integer>0</integer>

-	</dict>

-	<dict>

-		<key>ChildrenArray</key>

-		<array>

-			<dict>

-				<key>AudioList</key>

-				<array>

-					<dict>

-						<key>AudioBitrate</key>

-						<string>160</string>

-						<key>AudioEncoder</key>

-						<string>AAC (faac)</string>

-						<key>AudioMixdown</key>

-						<string>Dolby Pro Logic II</string>

-						<key>AudioSamplerate</key>

-						<string>48</string>

-						<key>AudioTrack</key>

-						<integer>1</integer>

-						<key>AudioTrackDRCSlider</key>

-						<real>0.0</real>

-					</dict>

-				</array>

-				<key>ChapterMarkers</key>

-				<integer>0</integer>

-				<key>Default</key>

-				<integer>0</integer>

-				<key>FileFormat</key>

-				<string>MP4 file</string>

-				<key>PictureAutoCrop</key>

-				<integer>1</integer>

-				<key>PictureBottomCrop</key>

-				<integer>0</integer>

-				<key>PictureDeblock</key>

-				<integer>0</integer>

-				<key>PictureDeinterlace</key>

-				<integer>0</integer>

-				<key>PictureDenoise</key>

-				<integer>0</integer>

-				<key>PictureDetelecine</key>

-				<integer>0</integer>

-				<key>PictureHeight</key>

-				<integer>0</integer>

-				<key>PictureKeepRatio</key>

-				<integer>1</integer>

-				<key>PictureLeftCrop</key>

-				<integer>0</integer>

-				<key>PicturePAR</key>

-				<integer>0</integer>

-				<key>PictureRightCrop</key>

-				<integer>0</integer>

-				<key>PictureTopCrop</key>

-				<integer>0</integer>

-				<key>PictureWidth</key>

-				<integer>0</integer>

-				<key>PresetDescription</key>

-				<string>HandBrake's traditional, faster, lower-quality settings.</string>

-				<key>PresetName</key>

-				<string>Classic</string>

-				<key>Subtitles</key>

-				<string>None</string>

-				<key>Type</key>

-				<integer>0</integer>

-				<key>UsesMaxPictureSettings</key>

-				<integer>1</integer>

-				<key>UsesPictureFilters</key>

-				<integer>1</integer>

-				<key>UsesPictureSettings</key>

-				<integer>1</integer>

-				<key>VFR</key>

-				<integer>0</integer>

-				<key>VideoAvgBitrate</key>

-				<string>1000</string>

-				<key>VideoEncoder</key>

-				<string>MPEG-4 (FFmpeg)</string>

-				<key>VideoFramerate</key>

-				<string>Same as source</string>

-				<key>VideoGrayScale</key>

-				<integer>0</integer>

-				<key>VideoQualitySlider</key>

-				<real>0.64709997177124023</real>

-				<key>VideoQualityType</key>

-				<integer>1</integer>

-				<key>VideoTargetSize</key>

-				<string>700</string>

-				<key>VideoTwoPass</key>

-				<integer>0</integer>

-				<key>x264Option</key>

-				<string></string>

-			</dict>

-			<dict>

-				<key>AudioList</key>

-				<array>

-					<dict>

-						<key>AudioBitrate</key>

-						<string>160</string>

-						<key>AudioEncoder</key>

-						<string>AAC (faac)</string>

-						<key>AudioMixdown</key>

-						<string>Dolby Pro Logic II</string>

-						<key>AudioSamplerate</key>

-						<string>48</string>

-						<key>AudioTrack</key>

-						<integer>1</integer>

-						<key>AudioTrackDRCSlider</key>

-						<real>0.0</real>

-					</dict>

-					<dict>

-						<key>AudioBitrate</key>

-						<string>160</string>

-						<key>AudioEncoder</key>

-						<string>AC3 Passthru</string>

-						<key>AudioMixdown</key>

-						<string>AC3 Passthru</string>

-						<key>AudioSamplerate</key>

-						<string>Auto</string>

-						<key>AudioTrack</key>

-						<integer>1</integer>

-						<key>AudioTrackDRCSlider</key>

-						<real>0.0</real>

-					</dict>

-				</array>

-				<key>ChapterMarkers</key>

-				<integer>1</integer>

-				<key>Default</key>

-				<integer>0</integer>

-				<key>FileFormat</key>

-				<string>MP4 file</string>

-				<key>Mp4LargeFile</key>

-				<integer>1</integer>

-				<key>PictureAutoCrop</key>

-				<integer>1</integer>

-				<key>PictureBottomCrop</key>

-				<integer>0</integer>

-				<key>PictureDeblock</key>

-				<integer>0</integer>

-				<key>PictureDeinterlace</key>

-				<integer>0</integer>

-				<key>PictureDenoise</key>

-				<integer>0</integer>

-				<key>PictureDetelecine</key>

-				<integer>0</integer>

-				<key>PictureHeight</key>

-				<integer>0</integer>

-				<key>PictureKeepRatio</key>

-				<integer>0</integer>

-				<key>PictureLeftCrop</key>

-				<integer>0</integer>

-				<key>PicturePAR</key>

-				<integer>1</integer>

-				<key>PictureRightCrop</key>

-				<integer>0</integer>

-				<key>PictureTopCrop</key>

-				<integer>0</integer>

-				<key>PictureWidth</key>

-				<integer>0</integer>

-				<key>PresetDescription</key>

-				<string>HandBrake's deprecated settings for the AppleTV, including Dolby Digital 5.1 AC3 sound. Provides a good balance between quality and file size, and optimizes performance. This is the AppleTV preset from HandBrake 0.9.2, and while it is offered as a service to legacy users, it is no longer supported.</string>

-				<key>PresetName</key>

-				<string>AppleTV Legacy</string>

-				<key>Subtitles</key>

-				<string>None</string>

-				<key>Type</key>

-				<integer>0</integer>

-				<key>UsesMaxPictureSettings</key>

-				<integer>1</integer>

-				<key>UsesPictureFilters</key>

-				<integer>1</integer>

-				<key>UsesPictureSettings</key>

-				<integer>1</integer>

-				<key>VFR</key>

-				<integer>0</integer>

-				<key>VideoAvgBitrate</key>

-				<string>2500</string>

-				<key>VideoEncoder</key>

-				<string>H.264 (x264)</string>

-				<key>VideoFramerate</key>

-				<string>Same as source</string>

-				<key>VideoGrayScale</key>

-				<integer>0</integer>

-				<key>VideoQualitySlider</key>

-				<real>0.64709997177124023</real>

-				<key>VideoQualityType</key>

-				<integer>1</integer>

-				<key>VideoTargetSize</key>

-				<string>700</string>

-				<key>VideoTwoPass</key>

-				<integer>0</integer>

-				<key>x264Option</key>

-				<string>bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0</string>

-			</dict>

-			<dict>

-				<key>AudioList</key>

-				<array>

-					<dict>

-						<key>AudioBitrate</key>

-						<string>128</string>

-						<key>AudioEncoder</key>

-						<string>AAC (faac)</string>

-						<key>AudioMixdown</key>

-						<string>Dolby Pro Logic II</string>

-						<key>AudioSamplerate</key>

-						<string>48</string>

-						<key>AudioTrack</key>

-						<integer>1</integer>

-						<key>AudioTrackDRCSlider</key>

-						<real>0.0</real>

-					</dict>

-				</array>

-				<key>ChapterMarkers</key>

-				<integer>1</integer>

-				<key>Default</key>

-				<integer>0</integer>

-				<key>FileFormat</key>

-				<string>MP4 file</string>

-				<key>Mp4iPodCompatible</key>

-				<integer>1</integer>

-				<key>PictureAutoCrop</key>

-				<integer>1</integer>

-				<key>PictureBottomCrop</key>

-				<integer>0</integer>

-				<key>PictureDeblock</key>

-				<integer>0</integer>

-				<key>PictureDeinterlace</key>

-				<integer>0</integer>

-				<key>PictureDenoise</key>

-				<integer>0</integer>

-				<key>PictureDetelecine</key>

-				<integer>0</integer>

-				<key>PictureHeight</key>

-				<integer>0</integer>

-				<key>PictureKeepRatio</key>

-				<integer>1</integer>

-				<key>PictureLeftCrop</key>

-				<integer>0</integer>

-				<key>PicturePAR</key>

-				<integer>0</integer>

-				<key>PictureRightCrop</key>

-				<integer>0</integer>

-				<key>PictureTopCrop</key>

-				<integer>0</integer>

-				<key>PictureWidth</key>

-				<integer>480</integer>

-				<key>PresetDescription</key>

-				<string>HandBrake's deprecated settings for the iPhone and iPod Touch. This is the iPhone preset from HandBrake 0.9.2, and while it is offered as a service to legacy users, it is no longer supported.</string>

-				<key>PresetName</key>

-				<string>iPhone Legacy</string>

-				<key>Subtitles</key>

-				<string>None</string>

-				<key>Type</key>

-				<integer>0</integer>

-				<key>UsesMaxPictureSettings</key>

-				<integer>0</integer>

-				<key>UsesPictureFilters</key>

-				<integer>1</integer>

-				<key>UsesPictureSettings</key>

-				<integer>1</integer>

-				<key>VFR</key>

-				<integer>0</integer>

-				<key>VideoAvgBitrate</key>

-				<string>960</string>

-				<key>VideoEncoder</key>

-				<string>H.264 (x264)</string>

-				<key>VideoFramerate</key>

-				<string>Same as source</string>

-				<key>VideoGrayScale</key>

-				<integer>0</integer>

-				<key>VideoQualitySlider</key>

-				<real>0.64709997177124023</real>

-				<key>VideoQualityType</key>

-				<integer>1</integer>

-				<key>VideoTargetSize</key>

-				<string>700</string>

-				<key>VideoTwoPass</key>

-				<integer>0</integer>

-				<key>x264Option</key>

-				<string>level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0</string>

-			</dict>

-			<dict>

-				<key>AudioList</key>

-				<array>

-					<dict>

-						<key>AudioBitrate</key>

-						<string>160</string>

-						<key>AudioEncoder</key>

-						<string>AAC (faac)</string>

-						<key>AudioMixdown</key>

-						<string>Dolby Pro Logic II</string>

-						<key>AudioSamplerate</key>

-						<string>48</string>

-						<key>AudioTrack</key>

-						<integer>1</integer>

-						<key>AudioTrackDRCSlider</key>

-						<real>0.0</real>

-					</dict>

-				</array>

-				<key>ChapterMarkers</key>

-				<integer>1</integer>

-				<key>Default</key>

-				<integer>0</integer>

-				<key>FileFormat</key>

-				<string>MP4 file</string>

-				<key>Mp4iPodCompatible</key>

-				<integer>1</integer>

-				<key>PictureAutoCrop</key>

-				<integer>1</integer>

-				<key>PictureBottomCrop</key>

-				<integer>0</integer>

-				<key>PictureDeblock</key>

-				<integer>0</integer>

-				<key>PictureDeinterlace</key>

-				<integer>0</integer>

-				<key>PictureDenoise</key>

-				<integer>0</integer>

-				<key>PictureDetelecine</key>

-				<integer>0</integer>

-				<key>PictureHeight</key>

-				<integer>0</integer>

-				<key>PictureKeepRatio</key>

-				<integer>1</integer>

-				<key>PictureLeftCrop</key>

-				<integer>0</integer>

-				<key>PicturePAR</key>

-				<integer>0</integer>

-				<key>PictureRightCrop</key>

-				<integer>0</integer>

-				<key>PictureTopCrop</key>

-				<integer>0</integer>

-				<key>PictureWidth</key>

-				<integer>640</integer>

-				<key>PresetDescription</key>

-				<string>HandBrake's high resolution settings for older 5 and 5.5G iPods. Good video quality, great for viewing on a TV using your iPod. This is the iPod High-Rez preset from 0.9.2.</string>

-				<key>PresetName</key>

-				<string>iPod Legacy</string>

-				<key>Subtitles</key>

-				<string>None</string>

-				<key>Type</key>

-				<integer>0</integer>

-				<key>UsesMaxPictureSettings</key>

-				<integer>0</integer>

-				<key>UsesPictureFilters</key>

-				<integer>1</integer>

-				<key>UsesPictureSettings</key>

-				<integer>1</integer>

-				<key>VFR</key>

-				<integer>0</integer>

-				<key>VideoAvgBitrate</key>

-				<string>1500</string>

-				<key>VideoEncoder</key>

-				<string>H.264 (x264)</string>

-				<key>VideoFramerate</key>

-				<string>Same as source</string>

-				<key>VideoGrayScale</key>

-				<integer>0</integer>

-				<key>VideoQualitySlider</key>

-				<real>0.64709997177124023</real>

-				<key>VideoQualityType</key>

-				<integer>1</integer>

-				<key>VideoTargetSize</key>

-				<string>700</string>

-				<key>VideoTwoPass</key>

-				<integer>0</integer>

-				<key>x264Option</key>

-				<string>level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0</string>

-			</dict>

-		</array>

-		<key>Default</key>

-		<integer>0</integer>

-		<key>Folder</key>

-		<true/>

-		<key>PresetBuildNumber</key>

-		<integer>2009060401</integer>

-		<key>PresetName</key>

-		<string>Legacy</string>

-		<key>Type</key>

-		<integer>0</integer>

-	</dict>

-</array>

-</plist>

-

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<dict>
+		<key>ChildrenArray</key>
+		<array>
+			<dict>
+				<key>AudioList</key>
+				<array>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>160</string>
+						<key>AudioEncoder</key>
+						<string>AAC (faac)</string>
+						<key>AudioMixdown</key>
+						<string>Dolby Pro Logic II</string>
+						<key>AudioSamplerate</key>
+						<string>48</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+					</dict>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>160</string>
+						<key>AudioEncoder</key>
+						<string>AC3 Passthru</string>
+						<key>AudioMixdown</key>
+						<string>AC3 Passthru</string>
+						<key>AudioSamplerate</key>
+						<string>Auto</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+					</dict>
+				</array>
+				<key>ChapterMarkers</key>
+				<integer>1</integer>
+				<key>Default</key>
+				<integer>0</integer>
+				<key>FileFormat</key>
+				<string>MP4 file</string>
+				<key>Folder</key>
+				<false/>
+				<key>Mp4LargeFile</key>
+				<integer>0</integer>
+				<key>PictureAutoCrop</key>
+				<integer>1</integer>
+				<key>PictureBottomCrop</key>
+				<integer>0</integer>
+				<key>PictureDeblock</key>
+				<integer>0</integer>
+				<key>PictureDeinterlace</key>
+				<integer>0</integer>
+				<key>PictureDenoise</key>
+				<integer>0</integer>
+				<key>PictureDetelecine</key>
+				<integer>0</integer>
+				<key>PictureHeight</key>
+				<integer>0</integer>
+				<key>PictureKeepRatio</key>
+				<integer>0</integer>
+				<key>PictureLeftCrop</key>
+				<integer>0</integer>
+				<key>PicturePAR</key>
+				<integer>2</integer>
+				<key>PictureRightCrop</key>
+				<integer>0</integer>
+				<key>PictureTopCrop</key>
+				<integer>0</integer>
+				<key>PictureWidth</key>
+				<integer>720</integer>
+				<key>PresetDescription</key>
+				<string>HandBrake's universally compatible, full resolution settings for all current Apple devices: iPod (6G and up), iPhone, AppleTV, and Macs</string>
+				<key>PresetName</key>
+				<string>Universal</string>
+				<key>Subtitles</key>
+				<string>None</string>
+				<key>Type</key>
+				<integer>0</integer>
+				<key>UsesPictureFilters</key>
+				<integer>1</integer>
+				<key>UsesPictureSettings</key>
+				<integer>1</integer>
+				<key>VFR</key>
+				<integer>0</integer>
+				<key>VideoAvgBitrate</key>
+				<string>2500</string>
+				<key>VideoEncoder</key>
+				<string>H.264 (x264)</string>
+				<key>VideoFramerate</key>
+				<string>Same as source</string>
+				<key>VideoGrayScale</key>
+				<integer>0</integer>
+				<key>VideoQualitySlider</key>
+				<real>20</real>
+				<key>VideoQualityType</key>
+				<integer>2</integer>
+				<key>VideoTargetSize</key>
+				<string>700</string>
+				<key>VideoTwoPass</key>
+				<integer>0</integer>
+				<key>x264Option</key>
+				<string>cabac=0:ref=2:me=umh:bframes=0:8x8dct=0:trellis=0:subme=6</string>
+			</dict>
+			<dict>
+				<key>AudioList</key>
+				<array>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>160</string>
+						<key>AudioEncoder</key>
+						<string>AAC (faac)</string>
+						<key>AudioMixdown</key>
+						<string>Dolby Pro Logic II</string>
+						<key>AudioSamplerate</key>
+						<string>48</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+					</dict>
+				</array>
+				<key>ChapterMarkers</key>
+				<integer>1</integer>
+				<key>Default</key>
+				<integer>0</integer>
+				<key>FileFormat</key>
+				<string>MP4 file</string>
+				<key>Mp4iPodCompatible</key>
+				<integer>1</integer>
+				<key>PictureAutoCrop</key>
+				<integer>1</integer>
+				<key>PictureBottomCrop</key>
+				<integer>0</integer>
+				<key>PictureDeblock</key>
+				<integer>0</integer>
+				<key>PictureDeinterlace</key>
+				<integer>0</integer>
+				<key>PictureDenoise</key>
+				<integer>0</integer>
+				<key>PictureDetelecine</key>
+				<integer>0</integer>
+				<key>PictureHeight</key>
+				<integer>0</integer>
+				<key>PictureKeepRatio</key>
+				<integer>1</integer>
+				<key>PictureLeftCrop</key>
+				<integer>0</integer>
+				<key>PicturePAR</key>
+				<integer>0</integer>
+				<key>PictureRightCrop</key>
+				<integer>0</integer>
+				<key>PictureTopCrop</key>
+				<integer>0</integer>
+				<key>PictureWidth</key>
+				<integer>320</integer>
+				<key>PresetDescription</key>
+				<string>HandBrake's low resolution settings for the iPod (5G and up). Optimized for great playback on the iPod screen, with smaller file size.</string>
+				<key>PresetName</key>
+				<string>iPod</string>
+				<key>Subtitles</key>
+				<string>None</string>
+				<key>Type</key>
+				<integer>0</integer>
+				<key>UsesMaxPictureSettings</key>
+				<integer>0</integer>
+				<key>UsesPictureFilters</key>
+				<integer>1</integer>
+				<key>UsesPictureSettings</key>
+				<integer>1</integer>
+				<key>VFR</key>
+				<integer>0</integer>
+				<key>VideoAvgBitrate</key>
+				<string>700</string>
+				<key>VideoEncoder</key>
+				<string>H.264 (x264)</string>
+				<key>VideoFramerate</key>
+				<string>Same as source</string>
+				<key>VideoGrayScale</key>
+				<integer>0</integer>
+				<key>VideoQualitySlider</key>
+				<real>0.64709997177124023</real>
+				<key>VideoQualityType</key>
+				<integer>1</integer>
+				<key>VideoTargetSize</key>
+				<string>700</string>
+				<key>VideoTwoPass</key>
+				<integer>0</integer>
+				<key>x264Option</key>
+				<string>level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0</string>
+			</dict>
+			<dict>
+				<key>AudioList</key>
+				<array>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>128</string>
+						<key>AudioEncoder</key>
+						<string>AAC (faac)</string>
+						<key>AudioMixdown</key>
+						<string>Dolby Pro Logic II</string>
+						<key>AudioSamplerate</key>
+						<string>48</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+					</dict>
+				</array>
+				<key>ChapterMarkers</key>
+				<integer>1</integer>
+				<key>Default</key>
+				<integer>0</integer>
+				<key>FileFormat</key>
+				<string>MP4 file</string>
+				<key>Mp4iPodCompatible</key>
+				<integer>0</integer>
+				<key>PictureAutoCrop</key>
+				<integer>1</integer>
+				<key>PictureBottomCrop</key>
+				<integer>0</integer>
+				<key>PictureDeblock</key>
+				<integer>0</integer>
+				<key>PictureDeinterlace</key>
+				<integer>0</integer>
+				<key>PictureDenoise</key>
+				<integer>0</integer>
+				<key>PictureDetelecine</key>
+				<integer>0</integer>
+				<key>PictureHeight</key>
+				<integer>0</integer>
+				<key>PictureKeepRatio</key>
+				<integer>1</integer>
+				<key>PictureLeftCrop</key>
+				<integer>0</integer>
+				<key>PicturePAR</key>
+				<integer>0</integer>
+				<key>PictureRightCrop</key>
+				<integer>0</integer>
+				<key>PictureTopCrop</key>
+				<integer>0</integer>
+				<key>PictureWidth</key>
+				<integer>480</integer>
+				<key>PresetDescription</key>
+				<string>HandBrake's settings for the iPhone and iPod Touch.</string>
+				<key>PresetName</key>
+				<string>iPhone &amp; iPod Touch</string>
+				<key>Subtitles</key>
+				<string>None</string>
+				<key>Type</key>
+				<integer>0</integer>
+				<key>UsesMaxPictureSettings</key>
+				<integer>0</integer>
+				<key>UsesPictureFilters</key>
+				<integer>1</integer>
+				<key>UsesPictureSettings</key>
+				<integer>1</integer>
+				<key>VFR</key>
+				<integer>0</integer>
+				<key>VideoAvgBitrate</key>
+				<string>960</string>
+				<key>VideoEncoder</key>
+				<string>H.264 (x264)</string>
+				<key>VideoFramerate</key>
+				<string>Same as source</string>
+				<key>VideoGrayScale</key>
+				<integer>0</integer>
+				<key>VideoQualitySlider</key>
+				<real>20</real>
+				<key>VideoQualityType</key>
+				<integer>2</integer>
+				<key>VideoTargetSize</key>
+				<string>700</string>
+				<key>VideoTwoPass</key>
+				<integer>0</integer>
+				<key>x264Option</key>
+				<string>cabac=0:ref=2:me=umh:bframes=0:subme=6:8x8dct=0:trellis=0</string>
+			</dict>
+			<dict>
+				<key>AudioList</key>
+				<array>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>160</string>
+						<key>AudioEncoder</key>
+						<string>AAC (faac)</string>
+						<key>AudioMixdown</key>
+						<string>Dolby Pro Logic II</string>
+						<key>AudioSamplerate</key>
+						<string>48</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+					</dict>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>160</string>
+						<key>AudioEncoder</key>
+						<string>AC3 Passthru</string>
+						<key>AudioMixdown</key>
+						<string>AC3 Passthru</string>
+						<key>AudioSamplerate</key>
+						<string>Auto</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+					</dict>
+				</array>
+				<key>ChapterMarkers</key>
+				<integer>1</integer>
+				<key>Default</key>
+				<integer>0</integer>
+				<key>FileFormat</key>
+				<string>MP4 file</string>
+				<key>Folder</key>
+				<false/>
+				<key>Mp4LargeFile</key>
+				<integer>1</integer>
+				<key>PictureAutoCrop</key>
+				<integer>1</integer>
+				<key>PictureBottomCrop</key>
+				<integer>0</integer>
+				<key>PictureDeblock</key>
+				<integer>0</integer>
+				<key>PictureDeinterlace</key>
+				<integer>0</integer>
+				<key>PictureDenoise</key>
+				<integer>0</integer>
+				<key>PictureDetelecine</key>
+				<integer>0</integer>
+				<key>PictureHeight</key>
+				<integer>0</integer>
+				<key>PictureKeepRatio</key>
+				<integer>0</integer>
+				<key>PictureLeftCrop</key>
+				<integer>0</integer>
+				<key>PicturePAR</key>
+				<integer>2</integer>
+				<key>PictureRightCrop</key>
+				<integer>0</integer>
+				<key>PictureTopCrop</key>
+				<integer>0</integer>
+				<key>PictureWidth</key>
+				<integer>960</integer>
+				<key>PresetDescription</key>
+				<string>HandBrake's settings for the AppleTV, including Dolby Digital 5.1 AC3 sound. Provides a good balance between quality and file size, and pushes the AppleTV to its limits.</string>
+				<key>PresetName</key>
+				<string>AppleTV</string>
+				<key>Subtitles</key>
+				<string>None</string>
+				<key>Type</key>
+				<integer>0</integer>
+				<key>UsesPictureFilters</key>
+				<integer>1</integer>
+				<key>UsesPictureSettings</key>
+				<integer>1</integer>
+				<key>VFR</key>
+				<integer>0</integer>
+				<key>VideoAvgBitrate</key>
+				<string>2500</string>
+				<key>VideoEncoder</key>
+				<string>H.264 (x264)</string>
+				<key>VideoFramerate</key>
+				<string>Same as source</string>
+				<key>VideoGrayScale</key>
+				<integer>0</integer>
+				<key>VideoQualitySlider</key>
+				<real>20</real>
+				<key>VideoQualityType</key>
+				<integer>2</integer>
+				<key>VideoTargetSize</key>
+				<string>700</string>
+				<key>VideoTwoPass</key>
+				<integer>0</integer>
+				<key>x264Option</key>
+				<string>cabac=0:ref=2:me=umh:b-adapt=2:weightb=0:trellis=0</string>
+			</dict>
+		</array>
+		<key>Default</key>
+		<integer>0</integer>
+		<key>Folder</key>
+		<true/>
+		<key>PresetBuildNumber</key>
+		<integer>2009073001</integer>
+		<key>PresetName</key>
+		<string>Apple</string>
+		<key>Type</key>
+		<integer>0</integer>
+	</dict>
+	<dict>
+		<key>ChildrenArray</key>
+		<array>
+			<dict>
+				<key>AudioList</key>
+				<array>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>160</string>
+						<key>AudioEncoder</key>
+						<string>AAC (faac)</string>
+						<key>AudioMixdown</key>
+						<string>Dolby Pro Logic II</string>
+						<key>AudioSamplerate</key>
+						<string>48</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+					</dict>
+				</array>
+				<key>ChapterMarkers</key>
+				<integer>1</integer>
+				<key>Default</key>
+				<integer>1</integer>
+				<key>FileFormat</key>
+				<string>MP4 file</string>
+				<key>PictureAutoCrop</key>
+				<integer>1</integer>
+				<key>PictureBottomCrop</key>
+				<integer>0</integer>
+				<key>PictureDeblock</key>
+				<integer>0</integer>
+				<key>PictureDeinterlace</key>
+				<integer>0</integer>
+				<key>PictureDenoise</key>
+				<integer>0</integer>
+				<key>PictureDetelecine</key>
+				<integer>0</integer>
+				<key>PictureHeight</key>
+				<integer>0</integer>
+				<key>PictureKeepRatio</key>
+				<integer>0</integer>
+				<key>PictureLeftCrop</key>
+				<integer>0</integer>
+				<key>PicturePAR</key>
+				<integer>1</integer>
+				<key>PictureRightCrop</key>
+				<integer>0</integer>
+				<key>PictureTopCrop</key>
+				<integer>0</integer>
+				<key>PictureWidth</key>
+				<integer>0</integer>
+				<key>PresetDescription</key>
+				<string>HandBrake's normal, default settings.</string>
+				<key>PresetName</key>
+				<string>Normal</string>
+				<key>Subtitles</key>
+				<string>None</string>
+				<key>Type</key>
+				<integer>0</integer>
+				<key>UsesMaxPictureSettings</key>
+				<integer>1</integer>
+				<key>UsesPictureFilters</key>
+				<integer>1</integer>
+				<key>UsesPictureSettings</key>
+				<integer>1</integer>
+				<key>VFR</key>
+				<integer>0</integer>
+				<key>VideoAvgBitrate</key>
+				<string>1500</string>
+				<key>VideoEncoder</key>
+				<string>H.264 (x264)</string>
+				<key>VideoFramerate</key>
+				<string>Same as source</string>
+				<key>VideoGrayScale</key>
+				<integer>0</integer>
+				<key>VideoQualitySlider</key>
+				<real>20</real>
+				<key>VideoQualityType</key>
+				<integer>2</integer>
+				<key>VideoTargetSize</key>
+				<string>700</string>
+				<key>VideoTurboTwoPass</key>
+				<integer>0</integer>
+				<key>VideoTwoPass</key>
+				<integer>0</integer>
+				<key>x264Option</key>
+				<string>ref=2:bframes=2:me=umh:subme=6:mixed-refs=0:weightb=0:8x8dct=0:trellis=0</string>
+			</dict>
+			<dict>
+				<key>AudioList</key>
+				<array>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>160</string>
+						<key>AudioEncoder</key>
+						<string>AAC (faac)</string>
+						<key>AudioMixdown</key>
+						<string>Dolby Pro Logic II</string>
+						<key>AudioSamplerate</key>
+						<string>48</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+					</dict>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>160</string>
+						<key>AudioEncoder</key>
+						<string>AC3 Passthru</string>
+						<key>AudioMixdown</key>
+						<string>AC3 Passthru</string>
+						<key>AudioSamplerate</key>
+						<string>Auto</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+					</dict>
+				</array>
+				<key>ChapterMarkers</key>
+				<integer>1</integer>
+				<key>Default</key>
+				<integer>0</integer>
+				<key>FileFormat</key>
+				<string>MP4 file</string>
+				<key>PictureAutoCrop</key>
+				<integer>1</integer>
+				<key>PictureBottomCrop</key>
+				<integer>0</integer>
+				<key>PictureDeblock</key>
+				<integer>0</integer>
+				<key>PictureDecomb</key>
+				<integer>1</integer>
+				<key>PictureDeinterlace</key>
+				<integer>0</integer>
+				<key>PictureDenoise</key>
+				<integer>0</integer>
+				<key>PictureDetelecine</key>
+				<integer>1</integer>
+				<key>PictureHeight</key>
+				<integer>0</integer>
+				<key>PictureKeepRatio</key>
+				<integer>0</integer>
+				<key>PictureLeftCrop</key>
+				<integer>0</integer>
+				<key>PicturePAR</key>
+				<integer>2</integer>
+				<key>PictureRightCrop</key>
+				<integer>0</integer>
+				<key>PictureTopCrop</key>
+				<integer>0</integer>
+				<key>PictureWidth</key>
+				<integer>0</integer>
+				<key>PresetDescription</key>
+				<string>HandBrake's general-purpose preset for High Profile H.264 video, with all the bells and whistles.</string>
+				<key>PresetName</key>
+				<string>High Profile</string>
+				<key>Subtitles</key>
+				<string>None</string>
+				<key>Type</key>
+				<integer>0</integer>
+				<key>UsesMaxPictureSettings</key>
+				<integer>1</integer>
+				<key>UsesPictureFilters</key>
+				<integer>1</integer>
+				<key>UsesPictureSettings</key>
+				<integer>1</integer>
+				<key>VideoAvgBitrate</key>
+				<string>1800</string>
+				<key>VideoEncoder</key>
+				<string>H.264 (x264)</string>
+				<key>VideoFramerate</key>
+				<string>Same as source</string>
+				<key>VideoGrayScale</key>
+				<integer>0</integer>
+				<key>VideoQualitySlider</key>
+				<real>20</real>
+				<key>VideoQualityType</key>
+				<integer>2</integer>
+				<key>VideoTargetSize</key>
+				<string>700</string>
+				<key>VideoTurboTwoPass</key>
+				<integer>0</integer>
+				<key>VideoTwoPass</key>
+				<integer>0</integer>
+				<key>x264Option</key>
+				<string>b-pyramid:b-adapt=2:me=umh:subme=9:analyse=all:trellis=0</string>
+			</dict>
+		</array>
+		<key>Default</key>
+		<integer>0</integer>
+		<key>Folder</key>
+		<true/>
+		<key>PresetBuildNumber</key>
+		<integer>2009073001</integer>
+		<key>PresetName</key>
+		<string>Regular</string>
+		<key>Type</key>
+		<integer>0</integer>
+	</dict>
+	<dict>
+		<key>ChildrenArray</key>
+		<array>
+			<dict>
+				<key>AudioList</key>
+				<array>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>160</string>
+						<key>AudioEncoder</key>
+						<string>AAC (faac)</string>
+						<key>AudioMixdown</key>
+						<string>Dolby Pro Logic II</string>
+						<key>AudioSamplerate</key>
+						<string>48</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+					</dict>
+				</array>
+				<key>ChapterMarkers</key>
+				<integer>0</integer>
+				<key>Default</key>
+				<integer>0</integer>
+				<key>FileFormat</key>
+				<string>MP4 file</string>
+				<key>PictureAutoCrop</key>
+				<integer>1</integer>
+				<key>PictureBottomCrop</key>
+				<integer>0</integer>
+				<key>PictureDeblock</key>
+				<integer>0</integer>
+				<key>PictureDeinterlace</key>
+				<integer>0</integer>
+				<key>PictureDenoise</key>
+				<integer>0</integer>
+				<key>PictureDetelecine</key>
+				<integer>0</integer>
+				<key>PictureHeight</key>
+				<integer>0</integer>
+				<key>PictureKeepRatio</key>
+				<integer>1</integer>
+				<key>PictureLeftCrop</key>
+				<integer>0</integer>
+				<key>PicturePAR</key>
+				<integer>0</integer>
+				<key>PictureRightCrop</key>
+				<integer>0</integer>
+				<key>PictureTopCrop</key>
+				<integer>0</integer>
+				<key>PictureWidth</key>
+				<integer>0</integer>
+				<key>PresetDescription</key>
+				<string>HandBrake's traditional, faster, lower-quality settings.</string>
+				<key>PresetName</key>
+				<string>Classic</string>
+				<key>Subtitles</key>
+				<string>None</string>
+				<key>Type</key>
+				<integer>0</integer>
+				<key>UsesMaxPictureSettings</key>
+				<integer>1</integer>
+				<key>UsesPictureFilters</key>
+				<integer>1</integer>
+				<key>UsesPictureSettings</key>
+				<integer>1</integer>
+				<key>VFR</key>
+				<integer>0</integer>
+				<key>VideoAvgBitrate</key>
+				<string>1000</string>
+				<key>VideoEncoder</key>
+				<string>MPEG-4 (FFmpeg)</string>
+				<key>VideoFramerate</key>
+				<string>Same as source</string>
+				<key>VideoGrayScale</key>
+				<integer>0</integer>
+				<key>VideoQualitySlider</key>
+				<real>0.64709997177124023</real>
+				<key>VideoQualityType</key>
+				<integer>1</integer>
+				<key>VideoTargetSize</key>
+				<string>700</string>
+				<key>VideoTwoPass</key>
+				<integer>0</integer>
+				<key>x264Option</key>
+				<string></string>
+			</dict>
+			<dict>
+				<key>AudioList</key>
+				<array>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>160</string>
+						<key>AudioEncoder</key>
+						<string>AAC (faac)</string>
+						<key>AudioMixdown</key>
+						<string>Dolby Pro Logic II</string>
+						<key>AudioSamplerate</key>
+						<string>48</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+					</dict>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>160</string>
+						<key>AudioEncoder</key>
+						<string>AC3 Passthru</string>
+						<key>AudioMixdown</key>
+						<string>AC3 Passthru</string>
+						<key>AudioSamplerate</key>
+						<string>Auto</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+					</dict>
+				</array>
+				<key>ChapterMarkers</key>
+				<integer>1</integer>
+				<key>Default</key>
+				<integer>0</integer>
+				<key>FileFormat</key>
+				<string>MP4 file</string>
+				<key>Mp4LargeFile</key>
+				<integer>1</integer>
+				<key>PictureAutoCrop</key>
+				<integer>1</integer>
+				<key>PictureBottomCrop</key>
+				<integer>0</integer>
+				<key>PictureDeblock</key>
+				<integer>0</integer>
+				<key>PictureDeinterlace</key>
+				<integer>0</integer>
+				<key>PictureDenoise</key>
+				<integer>0</integer>
+				<key>PictureDetelecine</key>
+				<integer>0</integer>
+				<key>PictureHeight</key>
+				<integer>0</integer>
+				<key>PictureKeepRatio</key>
+				<integer>0</integer>
+				<key>PictureLeftCrop</key>
+				<integer>0</integer>
+				<key>PicturePAR</key>
+				<integer>1</integer>
+				<key>PictureRightCrop</key>
+				<integer>0</integer>
+				<key>PictureTopCrop</key>
+				<integer>0</integer>
+				<key>PictureWidth</key>
+				<integer>0</integer>
+				<key>PresetDescription</key>
+				<string>HandBrake's deprecated settings for the AppleTV, including Dolby Digital 5.1 AC3 sound. Provides a good balance between quality and file size, and optimizes performance. This is the AppleTV preset from HandBrake 0.9.2, and while it is offered as a service to legacy users, it is no longer supported.</string>
+				<key>PresetName</key>
+				<string>AppleTV Legacy</string>
+				<key>Subtitles</key>
+				<string>None</string>
+				<key>Type</key>
+				<integer>0</integer>
+				<key>UsesMaxPictureSettings</key>
+				<integer>1</integer>
+				<key>UsesPictureFilters</key>
+				<integer>1</integer>
+				<key>UsesPictureSettings</key>
+				<integer>1</integer>
+				<key>VFR</key>
+				<integer>0</integer>
+				<key>VideoAvgBitrate</key>
+				<string>2500</string>
+				<key>VideoEncoder</key>
+				<string>H.264 (x264)</string>
+				<key>VideoFramerate</key>
+				<string>Same as source</string>
+				<key>VideoGrayScale</key>
+				<integer>0</integer>
+				<key>VideoQualitySlider</key>
+				<real>0.64709997177124023</real>
+				<key>VideoQualityType</key>
+				<integer>1</integer>
+				<key>VideoTargetSize</key>
+				<string>700</string>
+				<key>VideoTwoPass</key>
+				<integer>0</integer>
+				<key>x264Option</key>
+				<string>ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0</string>
+			</dict>
+			<dict>
+				<key>AudioList</key>
+				<array>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>128</string>
+						<key>AudioEncoder</key>
+						<string>AAC (faac)</string>
+						<key>AudioMixdown</key>
+						<string>Dolby Pro Logic II</string>
+						<key>AudioSamplerate</key>
+						<string>48</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+					</dict>
+				</array>
+				<key>ChapterMarkers</key>
+				<integer>1</integer>
+				<key>Default</key>
+				<integer>0</integer>
+				<key>FileFormat</key>
+				<string>MP4 file</string>
+				<key>Mp4iPodCompatible</key>
+				<integer>1</integer>
+				<key>PictureAutoCrop</key>
+				<integer>1</integer>
+				<key>PictureBottomCrop</key>
+				<integer>0</integer>
+				<key>PictureDeblock</key>
+				<integer>0</integer>
+				<key>PictureDeinterlace</key>
+				<integer>0</integer>
+				<key>PictureDenoise</key>
+				<integer>0</integer>
+				<key>PictureDetelecine</key>
+				<integer>0</integer>
+				<key>PictureHeight</key>
+				<integer>0</integer>
+				<key>PictureKeepRatio</key>
+				<integer>1</integer>
+				<key>PictureLeftCrop</key>
+				<integer>0</integer>
+				<key>PicturePAR</key>
+				<integer>0</integer>
+				<key>PictureRightCrop</key>
+				<integer>0</integer>
+				<key>PictureTopCrop</key>
+				<integer>0</integer>
+				<key>PictureWidth</key>
+				<integer>480</integer>
+				<key>PresetDescription</key>
+				<string>HandBrake's deprecated settings for the iPhone and iPod Touch. This is the iPhone preset from HandBrake 0.9.2, and while it is offered as a service to legacy users, it is no longer supported.</string>
+				<key>PresetName</key>
+				<string>iPhone Legacy</string>
+				<key>Subtitles</key>
+				<string>None</string>
+				<key>Type</key>
+				<integer>0</integer>
+				<key>UsesMaxPictureSettings</key>
+				<integer>0</integer>
+				<key>UsesPictureFilters</key>
+				<integer>1</integer>
+				<key>UsesPictureSettings</key>
+				<integer>1</integer>
+				<key>VFR</key>
+				<integer>0</integer>
+				<key>VideoAvgBitrate</key>
+				<string>960</string>
+				<key>VideoEncoder</key>
+				<string>H.264 (x264)</string>
+				<key>VideoFramerate</key>
+				<string>Same as source</string>
+				<key>VideoGrayScale</key>
+				<integer>0</integer>
+				<key>VideoQualitySlider</key>
+				<real>0.64709997177124023</real>
+				<key>VideoQualityType</key>
+				<integer>1</integer>
+				<key>VideoTargetSize</key>
+				<string>700</string>
+				<key>VideoTwoPass</key>
+				<integer>0</integer>
+				<key>x264Option</key>
+				<string>level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:bframes=0:subme=6:8x8dct=0:trellis=0</string>
+			</dict>
+			<dict>
+				<key>AudioList</key>
+				<array>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>160</string>
+						<key>AudioEncoder</key>
+						<string>AAC (faac)</string>
+						<key>AudioMixdown</key>
+						<string>Dolby Pro Logic II</string>
+						<key>AudioSamplerate</key>
+						<string>48</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+					</dict>
+				</array>
+				<key>ChapterMarkers</key>
+				<integer>1</integer>
+				<key>Default</key>
+				<integer>0</integer>
+				<key>FileFormat</key>
+				<string>MP4 file</string>
+				<key>Mp4iPodCompatible</key>
+				<integer>1</integer>
+				<key>PictureAutoCrop</key>
+				<integer>1</integer>
+				<key>PictureBottomCrop</key>
+				<integer>0</integer>
+				<key>PictureDeblock</key>
+				<integer>0</integer>
+				<key>PictureDeinterlace</key>
+				<integer>0</integer>
+				<key>PictureDenoise</key>
+				<integer>0</integer>
+				<key>PictureDetelecine</key>
+				<integer>0</integer>
+				<key>PictureHeight</key>
+				<integer>0</integer>
+				<key>PictureKeepRatio</key>
+				<integer>1</integer>
+				<key>PictureLeftCrop</key>
+				<integer>0</integer>
+				<key>PicturePAR</key>
+				<integer>0</integer>
+				<key>PictureRightCrop</key>
+				<integer>0</integer>
+				<key>PictureTopCrop</key>
+				<integer>0</integer>
+				<key>PictureWidth</key>
+				<integer>640</integer>
+				<key>PresetDescription</key>
+				<string>HandBrake's high resolution settings for older 5 and 5.5G iPods. Good video quality, great for viewing on a TV using your iPod. This is the iPod High-Rez preset from 0.9.2.</string>
+				<key>PresetName</key>
+				<string>iPod Legacy</string>
+				<key>Subtitles</key>
+				<string>None</string>
+				<key>Type</key>
+				<integer>0</integer>
+				<key>UsesMaxPictureSettings</key>
+				<integer>0</integer>
+				<key>UsesPictureFilters</key>
+				<integer>1</integer>
+				<key>UsesPictureSettings</key>
+				<integer>1</integer>
+				<key>VFR</key>
+				<integer>0</integer>
+				<key>VideoAvgBitrate</key>
+				<string>1500</string>
+				<key>VideoEncoder</key>
+				<string>H.264 (x264)</string>
+				<key>VideoFramerate</key>
+				<string>Same as source</string>
+				<key>VideoGrayScale</key>
+				<integer>0</integer>
+				<key>VideoQualitySlider</key>
+				<real>0.64709997177124023</real>
+				<key>VideoQualityType</key>
+				<integer>1</integer>
+				<key>VideoTargetSize</key>
+				<string>700</string>
+				<key>VideoTwoPass</key>
+				<integer>0</integer>
+				<key>x264Option</key>
+				<string>level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:subme=6:8x8dct=0:trellis=0</string>
+			</dict>
+		</array>
+		<key>Default</key>
+		<integer>0</integer>
+		<key>Folder</key>
+		<true/>
+		<key>PresetBuildNumber</key>
+		<integer>2009073001</integer>
+		<key>PresetName</key>
+		<string>Legacy</string>
+		<key>Type</key>
+		<integer>0</integer>
+	</dict>
+</array>
+</plist>
diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c
index 17c67db36..2b6b8830f 100644
--- a/gtk/src/x264handler.c
+++ b/gtk/src/x264handler.c
@@ -170,21 +170,21 @@ find_syn_match(const gchar *opt, gchar **syns)
 
 struct x264_opt_map_s x264_opt_map[] =
 {
-	{x264_ref_syns, "x264_refs", "1", X264_OPT_INT},
-	{x264_mixed_syns, "x264_mixed_refs", "0", X264_OPT_BOOL},
-	{x264_bframes_syns, "x264_bframes", "0", X264_OPT_INT},
+	{x264_ref_syns, "x264_refs", "3", X264_OPT_INT},
+	{x264_mixed_syns, "x264_mixed_refs", "1", X264_OPT_BOOL},
+	{x264_bframes_syns, "x264_bframes", "3", X264_OPT_INT},
 	{x264_direct_syns, "x264_direct", "spatial", X264_OPT_COMBO},
 	{x264_badapt_syns, "x264_b_adapt", "1", X264_OPT_COMBO},
-	{x264_weightb_syns, "x264_weighted_bframes", "0", X264_OPT_BOOL},
+	{x264_weightb_syns, "x264_weighted_bframes", "1", X264_OPT_BOOL},
 	{x264_bpyramid_syns, "x264_bpyramid", "0", X264_OPT_BOOL},
 	{x264_me_syns, "x264_me", "hex", X264_OPT_COMBO},
 	{x264_merange_syns, "x264_merange", "16", X264_OPT_INT},
-	{x264_subme_syns, "x264_subme", "6", X264_OPT_COMBO},
+	{x264_subme_syns, "x264_subme", "7", X264_OPT_COMBO},
 	{x264_analyse_syns, "x264_analyse", "some", X264_OPT_COMBO},
-	{x264_8x8dct_syns, "x264_8x8dct", "0", X264_OPT_BOOL},
+	{x264_8x8dct_syns, "x264_8x8dct", "1", X264_OPT_BOOL},
 	{x264_deblock_syns, "x264_deblock_alpha", "0,0", X264_OPT_DEBLOCK},
 	{x264_deblock_syns, "x264_deblock_beta", "0,0", X264_OPT_DEBLOCK},
-	{x264_trellis_syns, "x264_trellis", "0", X264_OPT_COMBO},
+	{x264_trellis_syns, "x264_trellis", "1", X264_OPT_COMBO},
 	{x264_pskip_syns, "x264_no_fast_pskip", "0", X264_OPT_BOOL},
 	{x264_decimate_syns, "x264_no_dct_decimate", "0", X264_OPT_BOOL},
 	{x264_cabac_syns, "x264_cabac", "1", X264_OPT_BOOL},
@@ -716,6 +716,16 @@ sanitize_x264opts(signal_user_data_t *ud, const gchar *options)
 	{
 		x264_remove_opt(split, x264_psy_syns);
 	}
+	if (subme == 10)
+	{
+		gdouble psy_rd = ghb_settings_get_double(ud->settings, "x264_psy_rd");
+		if (psy_rd == 0.0)
+		{
+			gint pos = x264_find_opt(split, x264_subme_syns);
+			g_free(split[pos]);
+			split[pos] = g_strdup_printf("subme=9");
+		}
+	}
 	gint trell = ghb_settings_combo_int(ud->settings, "x264_trellis");
 	if (trell < 1)
 	{