]> git.sesse.net Git - vlc/commitdiff
macosx/CAS: add MKV to the black list for HTTP streaming
authorFelix Paul Kühne <fkuehne@videolan.org>
Fri, 28 Dec 2012 20:02:41 +0000 (21:02 +0100)
committerFelix Paul Kühne <fkuehne@videolan.org>
Fri, 28 Dec 2012 20:02:41 +0000 (21:02 +0100)
modules/gui/macosx/ConvertAndSave.m

index 7e593a9375332bd7f1cfc3f4936df813b3440c78..d884e0acc1923acc93e616733d86fac3af97a6e3 100644 (file)
@@ -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."),