vlc | branch: master | Felix Paul Kühne <[email protected]> | Fri Dec 28 21:02:41 2012 +0100| [ff241764f59729c01a0dcf4b149803a63c071bcd] | committer: Felix Paul Kühne
macosx/CAS: add MKV to the black list for HTTP streaming > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ff241764f59729c01a0dcf4b149803a63c071bcd --- modules/gui/macosx/ConvertAndSave.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gui/macosx/ConvertAndSave.m b/modules/gui/macosx/ConvertAndSave.m index 7e593a9..d884e0a 100644 --- a/modules/gui/macosx/ConvertAndSave.m +++ b/modules/gui/macosx/ConvertAndSave.m @@ -276,7 +276,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil; if (b_streaming) { if ([[[_stream_type_pop selectedItem] title] isEqualToString:@"HTTP"]) { NSString *muxformat = [self.currentProfile objectAtIndex:0]; - if ([muxformat isEqualToString:@"wav"] || [muxformat isEqualToString:@"mov"] || [muxformat isEqualToString:@"mp4"]) { + if ([muxformat isEqualToString:@"wav"] || [muxformat isEqualToString:@"mov"] || [muxformat isEqualToString:@"mp4"] || [muxformat isEqualToString:@"mkv"]) { NSBeginInformationalAlertSheet(_NS("Invalid container format for HTTP streaming"), _NS("OK"), @"", @"", _window, nil, nil, nil, nil, @"%@", _NS("Media encapsulated as %@ cannot be streamed through the HTTP protocol for technical reasons."), _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
