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

diff --git a/youtube_dl/downloader/__init__.py b/youtube_dl/downloader/__init__.py
index 19471a25073dc49fb3acaa7bf46a0cb5d47f0ea4..73b34fdae96262000b290df8031a4a1f6eb5e721 100644 (file)
--- 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 fe2a0198c27348746b5341853638ef4c094d2781..85cf834c7d69a873141a8ab1ea6299742bd0185f 100644 (file)
--- 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):