From c295490830d46379e89ce2128dc18a6cb2db3b72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Wed, 12 Nov 2014 09:42:35 +0100 Subject: [YoutubeDL] Fix bug in the detection of formats that don't contain video (fixes #4150) If the format requested was not available, we called the method '.get' in None. --- youtube_dl/YoutubeDL.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'youtube_dl') diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 9fdeb4cfb..7951001fa 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -837,14 +837,14 @@ class YoutubeDL(object): format_1, format_2 = rf.split('+') formats_info = (self.select_format(format_1, formats), self.select_format(format_2, formats)) - # The first format must contain the video and the - # second the audio - if formats_info[0].get('vcodec') == 'none': - self.report_error('The first format must contain ' - 'the video, try using "-f %s+%s"' % - (format_2, format_1)) - return if all(formats_info): + # The first format must contain the video and the + # second the audio + if formats_info[0].get('vcodec') == 'none': + self.report_error('The first format must ' + 'contain the video, try using ' + '"-f %s+%s"' % (format_2, format_1)) + return selected_format = { 'requested_formats': formats_info, 'format': rf, -- cgit v1.2.3