LinGui: merge preset changes to bugfix branch

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.9.x@4788 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml
index 42bec2cd8d281aa1052681c61751cbc9eb46f9de..bde38dd14c9ed7073fe9fa8059926b146c173ddc 100644 (file)
--- a/gtk/src/standard_presets.xml
+++ b/gtk/src/standard_presets.xml
@@ -650,6 +650,111 @@
                                <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>Auto</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>None</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>PictureDecomb</key>
+                               <integer>3</integer>
+                               <key>PictureDecombDeinterlace</key>
+                               <integer>1</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>PictureModulus</key>
+                               <integer>2</integer>
+                               <key>PicturePAR</key>
+                               <integer>2</integer>
+                               <key>PictureRightCrop</key>
+                               <integer>0</integer>
+                               <key>PictureTopCrop</key>
+                               <integer>0</integer>
+                               <key>PictureWidth</key>
+                               <integer>1920</integer>
+                               <key>PresetDescription</key>
+                               <string>HandBrake's preset for the Apple TV (3rd gen) is optimized for up to 1080p playback.</string>
+                               <key>PresetName</key>
+                               <string>AppleTV 3</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>VideoAvgBitrate</key>
+                               <string>2500</string>
+                               <key>VideoEncoder</key>
+                               <string>H.264 (x264)</string>
+                               <key>VideoFramerate</key>
+                               <string>30</string>
+                               <key>VideoFramerateMode</key>
+                               <string>pfr</string>
+                               <key>VideoGrayScale</key>
+                               <integer>0</integer>
+                               <key>VideoQualitySlider</key>
+                               <real>20</real>
+                               <key>VideoQualityType</key>
+                               <integer>2</integer>
+                               <key>VideoTwoPass</key>
+                               <integer>0</integer>
+                               <key>x264Option</key>
+                               <string>b-adapt=2</string>
+                       </dict>
                        <dict>
                                <key>AudioList</key>
                                <array>
@@ -830,7 +935,7 @@
                <key>Folder</key>
                <true/>
                <key>PresetBuildNumber</key>
-               <integer>2011072401</integer>
+               <integer>2012041101</integer>
                <key>PresetName</key>
                <string>Devices</string>
                <key>Type</key>
@@ -979,7 +1084,7 @@
                                <key>PictureDenoise</key>
                                <integer>0</integer>
                                <key>PictureDetelecine</key>
-                               <integer>2</integer>
+                               <integer>0</integer>
                                <key>PictureHeight</key>
                                <integer>0</integer>
                                <key>PictureKeepRatio</key>
@@ -1033,7 +1138,7 @@
                <key>Folder</key>
                <true/>
                <key>PresetBuildNumber</key>
-               <integer>2011072401</integer>
+               <integer>2012041101</integer>
                <key>PresetName</key>
                <string>Regular</string>
                <key>Type</key>
@@ -1212,7 +1317,7 @@
                <key>Folder</key>
                <true/>
                <key>PresetBuildNumber</key>
-               <integer>2011072401</integer>
+               <integer>2012041101</integer>
                <key>PresetName</key>
                <string>Legacy</string>
                <key>Type</key>