X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fstandard_presets.xml;h=8bbc8c10f8e914704b3fff8cc43249aff7506200;hb=65614f73668cf3b9bce217a75af62f43e22adc2e;hp=1f8e8c9803f6d30f47c5d6c42c33d473cac319c7;hpb=d265084c7c550b700a4d7a89dab6fe655891c2c6;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml
index 1f8e8c98..8bbc8c10 100644
--- a/gtk/src/standard_presets.xml
+++ b/gtk/src/standard_presets.xml
@@ -246,7 +246,7 @@
 				<key>PictureWidth</key>
 				<integer>480</integer>
 				<key>PresetDescription</key>
-				<string>HandBrake's settings for the iPhone and iPod Touch.</string>
+				<string>HandBrake's settings for all iPhones and iPod Touches going back to the original iPhone 2G.</string>
 				<key>PresetName</key>
 				<string>iPhone &amp; iPod Touch</string>
 				<key>Subtitles</key>
@@ -349,7 +349,7 @@
 				<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>
+				<string>HandBrake's settings for the AppleTV and 2009's iPhone and iPod Touch lineup. Provides a good balance between quality and file size, and pushes the devices to their limits. Includes Dolby Digital 5.1 AC3 sound for the AppleTV.</string>
 				<key>PresetName</key>
 				<string>AppleTV</string>
 				<key>Subtitles</key>
@@ -379,7 +379,7 @@
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
 				<key>x264Option</key>
-				<string>cabac=0:ref=2:me=umh:b-adapt=2:weightb=0:trellis=0</string>
+				<string>cabac=0:ref=2:me=umh:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500</string>
 			</dict>
 		</array>
 		<key>Default</key>
@@ -387,7 +387,7 @@
 		<key>Folder</key>
 		<true/>
 		<key>PresetBuildNumber</key>
-		<integer>2009073001</integer>
+		<integer>2009112101</integer>
 		<key>PresetName</key>
 		<string>Apple</string>
 		<key>Type</key>
@@ -481,7 +481,7 @@
 				<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>
+				<string>ref=2:bframes=2:subme=6:mixed-refs=0:weightb=0:8x8dct=0:trellis=0</string>
 			</dict>
 			<dict>
 				<key>AudioList</key>
@@ -528,13 +528,15 @@
 				<key>PictureDeblock</key>
 				<integer>0</integer>
 				<key>PictureDecomb</key>
+				<integer>2</integer>
+				<key>PictureDecombDeinterlace</key>
 				<integer>1</integer>
 				<key>PictureDeinterlace</key>
 				<integer>0</integer>
 				<key>PictureDenoise</key>
 				<integer>0</integer>
 				<key>PictureDetelecine</key>
-				<integer>1</integer>
+				<integer>2</integer>
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
@@ -582,7 +584,7 @@
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
 				<key>x264Option</key>
-				<string>b-pyramid:b-adapt=2:me=umh:subme=9:analyse=all:trellis=0</string>
+				<string>b-adapt=2:rc-lookahead=50</string>
 			</dict>
 		</array>
 		<key>Default</key>
@@ -590,7 +592,7 @@
 		<key>Folder</key>
 		<true/>
 		<key>PresetBuildNumber</key>
-		<integer>2009073001</integer>
+		<integer>2009112101</integer>
 		<key>PresetName</key>
 		<string>Regular</string>
 		<key>Type</key>
@@ -965,7 +967,7 @@
 		<key>Folder</key>
 		<true/>
 		<key>PresetBuildNumber</key>
-		<integer>2009073001</integer>
+		<integer>2009112101</integer>
 		<key>PresetName</key>
 		<string>Legacy</string>
 		<key>Type</key>