From: remitamine Date: Sun, 13 Mar 2016 19:25:39 +0000 (+0100) Subject: [download/external] move the check for multiple selected formats to get_suitable_down... X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=6ae27bed01111ddd3c533fb94ae187306e7cf940;p=youtube-dl [download/external] move the check for multiple selected formats to get_suitable_downloader --- 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):