ansol
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
7
0
Fork 0
Code Issues Projects Releases Wiki Activity

[download/external] move the check for multiple selected formats to get_suitable_downloader

This commit is contained in:
remitamine 2016-03-13 20:25:39 +01:00
parent da1973a038
commit 6ae27bed01
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/downloader/__init__.py
View File

@ -32,7 +32,7 @@ def get_suitable_downloader(info_dict, params={}):
protocol = determine_protocol(info_dict)
info_dict['protocol'] = protocol
# if (info_dict.get('start_time') or info_dict.get('end_time')) and FFmpegFD.can_download(info_dict):
# if (info_dict.get('start_time') or info_dict.get('end_time')) and not info_dict.get('requested_formats') and FFmpegFD.can_download(info_dict):
# return FFmpegFD
external_downloader = params.get('external_downloader')

2
youtube_dl/downloader/external.py
View File

@ -166,7 +166,7 @@ class HttpieFD(ExternalFD):
class FFmpegFD(ExternalFD):
@classmethod
def supports(cls, info_dict):
return info_dict['protocol'] in ('http', 'https', 'ftp', 'ftps', 'm3u8', 'rtsp', 'rtmp', 'mms') and not info_dict.get('requested_formats')
return info_dict['protocol'] in ('http', 'https', 'ftp', 'ftps', 'm3u8', 'rtsp', 'rtmp', 'mms')
@classmethod
def available(cls):