MacGui: Be Gone x264 (h.264 iPod) encoder drop down!

- Added an "Insert iPod Atom" checkbox right under "HTTP optimized" checkbox which sets job->ipod_atom = 1; in prepareJob if checked (Note: the name of the checkbox is currently up for debate, we are taking suggestions though the current name is most indicative of what it does).
-Level is now handled in the advanced panel opt strings for x264 and width is no longer sanity checked by the gui.
- Changed the remaining x264 (Main) to just x264
- Modified preset code to account for legacy presets from old dropdowns
- Modified built in presets to include "level=30" for iPod / iPhone presets NOTE: Update your built in presets if you want the iPod and iPhone presets to be compatible.
- Removed the "Reset Picture to 640 for x264 iPod" preference from the Preferences -> Picture panel.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/macosx/HBPresets.m b/macosx/HBPresets.m
index 7fd3968eb..f2534685f 100644
--- a/macosx/HBPresets.m
+++ b/macosx/HBPresets.m
@@ -946,7 +946,7 @@
     [preset setObject:@"x264 (h.264 iPod)" forKey:@"VideoEncoder"];
 
     /* x264 Option String */
-    [preset setObject:@"cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1" forKey:@"x264Option"];
+    [preset setObject:@"level=30:cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1" forKey:@"x264Option"];
 
     /* Video quality */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"VideoQualityType"];
@@ -1032,7 +1032,7 @@
     [preset setObject:@"x264 (h.264 iPod)" forKey:@"VideoEncoder"];
 
     /* x264 Option String */
-    [preset setObject:@"bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1" forKey:@"x264Option"];
+    [preset setObject:@"level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1" forKey:@"x264Option"];
 
     /* Video quality */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"VideoQualityType"];
@@ -1118,7 +1118,7 @@
     [preset setObject:@"x264 (h.264 iPod)" forKey:@"VideoEncoder"];
 
     /* x264 Option String */
-    [preset setObject:@"bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1" forKey:@"x264Option"];
+    [preset setObject:@"level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1" forKey:@"x264Option"];
 
     /* Video quality */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"VideoQualityType"];