xZero707/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-27 06:10:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sergey M․ 2015-04-19 22:33:52 +06:00
parent 70947ea7b1
commit c0dea0a782
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
youtube_dl/YoutubeDL.py
View File

@ -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')