[YoutubeDL] Respect explicit --merge-format-output
for uncompatible formats as well
This commit is contained in:
parent
70947ea7b1
commit
c0dea0a782
@ -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')
|
||||
|
Loading…
Reference in New Issue
Block a user