administration/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-14 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Fix --compat-option no-direct-merge

Browse Source
This commit is contained in:
pukkandan 2021-09-11 17:47:26 +05:30
parent 03c862794f
commit d5fe04f5c7
No known key found for this signature in database
GPG Key ID: 0F00D95A001F4698
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yt_dlp/YoutubeDL.py
View File

@ -2750,7 +2750,7 @@ class YoutubeDL(object):
_protocols = set(determine_protocol(f) for f in requested_formats) _protocols = set(determine_protocol(f) for f in requested_formats)
if len(_protocols) == 1: # All requested formats have same protocol if len(_protocols) == 1: # All requested formats have same protocol
info_dict['protocol'] = _protocols.pop() info_dict['protocol'] = _protocols.pop()
directly_mergable = FFmpegFD.can_merge_formats(info_dict) directly_mergable = FFmpegFD.can_merge_formats(info_dict, self.params)
if dl_filename is not None: if dl_filename is not None:
self.report_file_already_downloaded(dl_filename) self.report_file_already_downloaded(dl_filename)
elif (directly_mergable and get_suitable_downloader( elif (directly_mergable and get_suitable_downloader(

2
yt_dlp/downloader/external.py
View File

@ -357,7 +357,7 @@ class FFmpegFD(ExternalFD):
pass pass
@classmethod @classmethod
def can_merge_formats(cls, info_dict, params={}): def can_merge_formats(cls, info_dict, params):
return ( return (
info_dict.get('requested_formats') info_dict.get('requested_formats')
and info_dict.get('protocol') and info_dict.get('protocol')