From: Felix Paul Kühne <fkuehne@videolan.org>
Date: Thu, 25 Mar 2010 20:29:38 +0000 (+0100)
Subject: legacy OSX interface: fixed transcoding with the wizard and re-added mp4a as valid... 
X-Git-Tag: 1.1.0-pre1~315
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ad7e01030614f7b8d0381555cc09b1d61442de80;p=vlc

legacy OSX interface: fixed transcoding with the wizard and re-added mp4a as valid audio codec to the sout panel
---

diff --git a/modules/gui/macosx/output.m b/modules/gui/macosx/output.m
index 74c0432460..14ff97b768 100644
--- a/modules/gui/macosx/output.m
+++ b/modules/gui/macosx/output.m
@@ -129,7 +129,7 @@
     NSArray *o_v_bitrates = [NSArray arrayWithObjects: @"16", @"32", @"64", @"96",
         @"128", @"192", @"256", @"384", @"512", @"768", @"1024", @"2048", @"3072", nil];
     NSArray *o_v_scales = [NSArray arrayWithObjects: @"0.25",@"0.5",@"0.75",@"1",@"1.25",@"1.5",@"1.75",@"2",nil];
-    NSArray *o_a_codecs = [NSArray arrayWithObjects: @"mpga", @"mp3 ", @"a52 ", @"vorb", @"flac", @"spx ", nil]; //@"mp4a"
+    NSArray *o_a_codecs = [NSArray arrayWithObjects: @"mpga", @"mp3 ", @"mp4a", @"a52 ", @"vorb", @"flac", @"spx ", nil];
     NSArray *o_v_codecs = [NSArray arrayWithObjects: @"mp1v", @"mp2v", @"mp4v", @"DIV1",
         @"DIV2", @"DIV3", @"h263", @"h264", @"WMV1", @"WMV2", @"MJPG", @"theo", nil];
 
diff --git a/modules/gui/macosx/wizard.m b/modules/gui/macosx/wizard.m
index 95d6795824..37dc0f06e9 100644
--- a/modules/gui/macosx/wizard.m
+++ b/modules/gui/macosx/wizard.m
@@ -1592,8 +1592,8 @@ static VLCWizard *_o_sharedInstance = nil;
         }
  
         /* add subtitles to the video if desired */
-        [o_opts_string appendFormat: @":sout-transcode-soverlay=%@",
-                [o_userSelections objectForKey:@"soverlay"]];
+        if ([[o_userSelections objectForKey:@"soverlay"] intValue] > 0)
+            [o_opts_string appendString: @" --sout-transcode-soverlay"];
 
         [tempArray addObject: o_opts_string];