MacGui: Add ffmpeg (lavc) advanced options text box to the advanced panel.

- Fix a couple other traps for x264 opts as well.
- Add lavcOption Key to the presets as per the LinGui to maintain preset parity.

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

1 files changed, 21 insertions, 1 deletions

diff --git a/macosx/HBQueueController.mm b/macosx/HBQueueController.mm
index 86f1b759b..41576e242 100644
--- a/macosx/HBQueueController.mm
+++ b/macosx/HBQueueController.mm
@@ -1316,7 +1316,27 @@ return ![(HBQueueOutlineView*)outlineView isDragging];
         if ([[item objectForKey:@"VideoEncoder"] isEqualToString: @"H.264 (x264)"])
         {
             [finalString appendString: @"x264 Options: " withAttributes:detailBoldAttr];
-            [finalString appendString: [item objectForKey:@"x264Option"] withAttributes:detailAttr];
+            if ([item objectForKey:@"x264Option"])
+            {
+                [finalString appendString: [item objectForKey:@"x264Option"] withAttributes:detailAttr];
+            }
+            else
+            {
+                [finalString appendString: @"x264 defaults" withAttributes:detailAttr];   
+            }
+            [finalString appendString:@"\n" withAttributes:detailAttr];
+        }
+        else // we must be ffmpeg (lavc)
+        {
+            [finalString appendString: @"FFmpeg (lavc) Options: " withAttributes:detailBoldAttr];
+            if ([item objectForKey:@"lavcOption"])
+            {
+                [finalString appendString: [item objectForKey:@"lavcOption"] withAttributes:detailAttr];
+            }
+            else
+            {
+                [finalString appendString: @"FFmpeg (lavc) defaults" withAttributes:detailAttr];   
+            }
             [finalString appendString:@"\n" withAttributes:detailAttr];
         }