Commit 7b9251f8 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: exporting with mp4a is no longer supported, so don't offer this choice to the user

parent 7d302c6b
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
NSArray *o_v_bitrates = [NSArray arrayWithObjects: @"16", @"32", @"64", @"96", NSArray *o_v_bitrates = [NSArray arrayWithObjects: @"16", @"32", @"64", @"96",
@"128", @"192", @"256", @"384", @"512", @"768", @"1024", @"2048", @"3072", nil]; @"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_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 ", @"mp4a", @"a52 ", @"vorb", @"flac", @"spx ", nil]; NSArray *o_a_codecs = [NSArray arrayWithObjects: @"mpga", @"mp3 ", @"a52 ", @"vorb", @"flac", @"spx ", nil]; //@"mp4a"
NSArray *o_v_codecs = [NSArray arrayWithObjects: @"mp1v", @"mp2v", @"mp4v", @"DIV1", NSArray *o_v_codecs = [NSArray arrayWithObjects: @"mp1v", @"mp2v", @"mp4v", @"DIV1",
@"DIV2", @"DIV3", @"h263", @"h264", @"WMV1", @"WMV2", @"MJPG", @"theo", nil]; @"DIV2", @"DIV3", @"h263", @"h264", @"WMV1", @"WMV2", @"MJPG", @"theo", nil];
......
...@@ -168,7 +168,7 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -168,7 +168,7 @@ static VLCWizard *_o_sharedInstance = nil;
NSArray * o_mpga; NSArray * o_mpga;
NSArray * o_mp3; NSArray * o_mp3;
NSArray * o_mp4a; // NSArray * o_mp4a;
NSArray * o_a52; NSArray * o_a52;
NSArray * o_vorb; NSArray * o_vorb;
NSArray * o_flac; NSArray * o_flac;
...@@ -184,9 +184,9 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -184,9 +184,9 @@ static VLCWizard *_o_sharedInstance = nil;
_NS("MPEG Audio Layer 3 (useable with MPEG PS, MPEG TS, MPEG1, ASF, OGG " _NS("MPEG Audio Layer 3 (useable with MPEG PS, MPEG TS, MPEG1, ASF, OGG "
"and RAW)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG", "and RAW)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG",
@"MUX_RAW", @"-1", @"-1", @"-1", nil]; @"MUX_RAW", @"-1", @"-1", @"-1", nil];
o_mp4a = [NSArray arrayWithObjects: @"MPEG 4 Audio", @"mp4a", /* o_mp4a = [NSArray arrayWithObjects: @"MPEG 4 Audio", @"mp4a",
_NS("Audio format for MPEG4 (useable with MPEG TS and MPEG4)"), @"MUX_TS", _NS("Audio format for MPEG4 (useable with MPEG TS and MPEG4)"), @"MUX_TS",
@"MUX_MP4", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil]; @"MUX_MP4", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil]; */
o_a52 = [NSArray arrayWithObjects: @"A/52", @"a52", o_a52 = [NSArray arrayWithObjects: @"A/52", @"a52",
_NS("DVD audio format (useable with MPEG PS, MPEG TS, MPEG1, ASF, OGG " _NS("DVD audio format (useable with MPEG PS, MPEG TS, MPEG1, ASF, OGG "
"and RAW)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG", "and RAW)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_OGG",
...@@ -212,7 +212,7 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -212,7 +212,7 @@ static VLCWizard *_o_sharedInstance = nil;
_NS("Dummy codec (do not transcode, useable with all encapsulation " _NS("Dummy codec (do not transcode, useable with all encapsulation "
"formats)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_MP4", "formats)"), @"MUX_PS", @"MUX_TS", @"MUX_MPEG", @"MUX_ASF", @"MUX_MP4",
@"MUX_OGG", @"MUX_RAW", @"MUX_MOV", @"MUX_WAV", nil]; @"MUX_OGG", @"MUX_RAW", @"MUX_MOV", @"MUX_WAV", nil];
o_audioCodecs = [[NSArray alloc] initWithObjects: o_mpga, o_mp3, o_mp4a, o_audioCodecs = [[NSArray alloc] initWithObjects: o_mpga, o_mp3, //o_mp4a,
o_a52, o_vorb, o_flac, o_spx, o_s16l, o_fl32, o_dummyAud, nil]; o_a52, o_vorb, o_flac, o_spx, o_s16l, o_fl32, o_dummyAud, nil];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment