diff options
| author | remitamine <remitamine@gmail.com> | 2016-03-13 20:25:39 +0100 |
|---|---|---|
| committer | remitamine <remitamine@gmail.com> | 2016-03-13 20:34:38 +0100 |
| commit | 6ae27bed01111ddd3c533fb94ae187306e7cf940 (patch) | |
| tree | f14ab3abfdfd05ccfb53d131b65147f71c0272a4 /youtube_dl/downloader | |
| parent | da1973a0383ddc8125702e74a88d3a35bbfcf06d (diff) | |
[download/external] move the check for multiple selected formats to get_suitable_downloader
Diffstat (limited to 'youtube_dl/downloader')
| -rw-r--r-- | youtube_dl/downloader/__init__.py | 2 | ||||
| -rw-r--r-- | youtube_dl/downloader/external.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/downloader/__init__.py b/youtube_dl/downloader/__init__.py index 19471a250..73b34fdae 100644 --- a/youtube_dl/downloader/__init__.py +++ b/youtube_dl/downloader/__init__.py @@ -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') diff --git a/youtube_dl/downloader/external.py b/youtube_dl/downloader/external.py index fe2a0198c..85cf834c7 100644 --- a/youtube_dl/downloader/external.py +++ b/youtube_dl/downloader/external.py @@ -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): |