vlc | branch: master | David Fuhrmann <[email protected]> | Thu May 9 19:15:08 2013 +0200| [898a0cea4a4b42ac8016123823d1d395c5b0b0a6] | committer: David Fuhrmann
macosx: CAS: correctly allocate arrays (fixes #8597) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=898a0cea4a4b42ac8016123823d1d395c5b0b0a6 --- modules/gui/macosx/ConvertAndSave.m | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/gui/macosx/ConvertAndSave.m b/modules/gui/macosx/ConvertAndSave.m index 3356ae4..0a1bb2f 100644 --- a/modules/gui/macosx/ConvertAndSave.m +++ b/modules/gui/macosx/ConvertAndSave.m @@ -217,12 +217,18 @@ static VLCConvertAndSave *_o_sharedInstance = nil; [self setProfileNames: [defaults arrayForKey:@"CASProfileNames"]]; [self recreateProfilePopup]; - _videoCodecs = @[@[@"MPEG-1", @"MPEG-2", @"MPEG-4", @"DIVX 1", @"DIVX 2", @"DIVX 3", @"H.263", @"H.264", @"VP8", @"WMV1", @"WMV2", @"M-JPEG", @"Theora", @"Dirac"], - @[@"mpgv", @"mp2v", @"mp4v", @"DIV1", @"DIV2", @"DIV3", @"H263", @"h264", @"VP80", @"WMV1", @"WMV2", @"MJPG", @"theo", @"drac"]]; - _audioCodecs = @[@[@"MPEG Audio", @"MP3", @"MPEG 4 Audio (AAC)", @"A52/AC-3", @"Vorbis", @"Flac", @"Speex", @"WAV", @"WMA2"], - @[@"mpga", @"mp3", @"mp4a", @"a52", @"vorb", @"flac", @"spx", @"s16l", @"wma2"]]; - _subsCodecs = @[@[@"DVB subtitle", @"T.140"], - @[@"dvbs", @"t140"]]; + _videoCodecs = [[NSArray alloc] initWithObjects: + @[@"MPEG-1", @"MPEG-2", @"MPEG-4", @"DIVX 1", @"DIVX 2", @"DIVX 3", @"H.263", @"H.264", @"VP8", @"WMV1", @"WMV2", @"M-JPEG", @"Theora", @"Dirac"], + @[@"mpgv", @"mp2v", @"mp4v", @"DIV1", @"DIV2", @"DIV3", @"H263", @"h264", @"VP80", @"WMV1", @"WMV2", @"MJPG", @"theo", @"drac"], + nil]; + _audioCodecs = [[NSArray alloc] initWithObjects: + @[@"MPEG Audio", @"MP3", @"MPEG 4 Audio (AAC)", @"A52/AC-3", @"Vorbis", @"Flac", @"Speex", @"WAV", @"WMA2"], + @[@"mpga", @"mp3", @"mp4a", @"a52", @"vorb", @"flac", @"spx", @"s16l", @"wma2"], + nil]; + _subsCodecs = [[NSArray alloc] initWithObjects: + @[@"DVB subtitle", @"T.140"], + @[@"dvbs", @"t140"], + nil]; [_customize_vid_codec_pop removeAllItems]; [_customize_vid_scale_pop removeAllItems]; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
