youtube-dl

commit c0dea0a782a1035225ad25d556e398e2909f62db
parent 70947ea7b13d22a55756dc2b6d086e058edd91b1
Author: Sergey M․ <dstftw@gmail.com>
Date:   Sun, 19 Apr 2015 22:33:52 +0600

[YoutubeDL] Respect explicit `--merge-format-output` for uncompatible formats as well

Diffstat:
M
youtube_dl/YoutubeDL.py
 | 
3
+--

1 file changed, 1 insertion(+), 2 deletions(-)
diff --git 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')