summaryrefslogtreecommitdiffstats
path: root/gtk/src
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2010-07-03 18:24:11 +0000
committerjstebbins <[email protected]>2010-07-03 18:24:11 +0000
commitdaec13f6144419aa5efdada8598500f2d48cefac (patch)
treeb5da2527d2cbba30d35b94634efac3ba05cdd476 /gtk/src
parent4813f1cf12793faed41951e0e4a195332f97ddcd (diff)
fix some preset issues
add b-pyramid=none to appletv presets and remove b-pyramid hack from encx264.c change samplerate from 48 to 'Auto' in all presets cap samplerate to 48khz since none of the encoders support higher rates remove obsolete UsesMaxPictureSettings from all presets. replace with UsesPictureSettings=2 git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3424 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src')
-rw-r--r--gtk/src/standard_presets.xml34
1 files changed, 9 insertions, 25 deletions
diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml
index 3653c986a..d44f9421e 100644
--- a/gtk/src/standard_presets.xml
+++ b/gtk/src/standard_presets.xml
@@ -166,8 +166,6 @@
<string>None</string>
<key>Type</key>
<integer>0</integer>
- <key>UsesMaxPictureSettings</key>
- <integer>0</integer>
<key>UsesPictureFilters</key>
<integer>1</integer>
<key>UsesPictureSettings</key>
@@ -253,8 +251,6 @@
<string>None</string>
<key>Type</key>
<integer>0</integer>
- <key>UsesMaxPictureSettings</key>
- <integer>0</integer>
<key>UsesPictureFilters</key>
<integer>1</integer>
<key>UsesPictureSettings</key>
@@ -468,7 +464,7 @@
<key>VideoTwoPass</key>
<integer>0</integer>
<key>x264Option</key>
- <string>cabac=0:ref=2:me=umh:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500</string>
+ <string>cabac=0:ref=2:me=umh:b-pyramid=none:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500</string>
</dict>
</array>
<key>Default</key>
@@ -476,7 +472,7 @@
<key>Folder</key>
<true/>
<key>PresetBuildNumber</key>
- <integer>2010061801</integer>
+ <integer>2010070201</integer>
<key>PresetName</key>
<string>Apple</string>
<key>Type</key>
@@ -543,12 +539,10 @@
<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>
+ <integer>2</integer>
<key>VFR</key>
<integer>0</integer>
<key>VideoAvgBitrate</key>
@@ -648,12 +642,10 @@
<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>
+ <integer>2</integer>
<key>VideoAvgBitrate</key>
<string>1800</string>
<key>VideoEncoder</key>
@@ -681,7 +673,7 @@
<key>Folder</key>
<true/>
<key>PresetBuildNumber</key>
- <integer>2010061801</integer>
+ <integer>2010070201</integer>
<key>PresetName</key>
<string>Regular</string>
<key>Type</key>
@@ -748,12 +740,10 @@
<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>
+ <integer>2</integer>
<key>VFR</key>
<integer>0</integer>
<key>VideoAvgBitrate</key>
@@ -849,12 +839,10 @@
<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>
+ <integer>2</integer>
<key>VFR</key>
<integer>0</integer>
<key>VideoAvgBitrate</key>
@@ -874,7 +862,7 @@
<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>
+ <string>ref=1:b-pyramid=none:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0</string>
</dict>
<dict>
<key>AudioList</key>
@@ -936,8 +924,6 @@
<string>None</string>
<key>Type</key>
<integer>0</integer>
- <key>UsesMaxPictureSettings</key>
- <integer>0</integer>
<key>UsesPictureFilters</key>
<integer>1</integer>
<key>UsesPictureSettings</key>
@@ -1023,8 +1009,6 @@
<string>None</string>
<key>Type</key>
<integer>0</integer>
- <key>UsesMaxPictureSettings</key>
- <integer>0</integer>
<key>UsesPictureFilters</key>
<integer>1</integer>
<key>UsesPictureSettings</key>
@@ -1056,7 +1040,7 @@
<key>Folder</key>
<true/>
<key>PresetBuildNumber</key>
- <integer>2010061801</integer>
+ <integer>2010070201</integer>
<key>PresetName</key>
<string>Legacy</string>
<key>Type</key>