From c0dea0a782a1035225ad25d556e398e2909f62db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergey=20M=E2=80=A4?= <dstftw@gmail.com>
Date: Sun, 19 Apr 2015 22:33:52 +0600
Subject: [PATCH] [YoutubeDL] Respect explicit `--merge-format-output` for
uncompatible formats as well
---
youtube_dl/YoutubeDL.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
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')