From: Sergey M․ Date: Sun, 19 Apr 2015 16:33:52 +0000 (+0600) Subject: [YoutubeDL] Respect explicit `--merge-format-output` for uncompatible formats as... X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=c0dea0a782a1035225ad25d556e398e2909f62db;p=youtube-dl [YoutubeDL] Respect explicit `--merge-format-output` for uncompatible formats as well --- diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 5dd9d2430..3bb350e2a 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -1390,8 +1390,7 @@ class YoutubeDL(object): return False requested_formats = info_dict['requested_formats'] - # Merge incompatible formats into mkv - if not compatible_formats(requested_formats): + if self.params.get('merge_output_format') is None and not compatible_formats(requested_formats): filename = os.path.splitext(filename)[0] + '.mkv' self.report_warning('You have requested formats uncompatible for merge. ' 'The formats will be merged into mkv')