[YoutubeDL] Fallback to -f best when merger is outdated

This commit is contained in:
Sergey M․ 2015-05-11 00:27:29 +06:00
parent 70484b9f8a
commit 7fcb605b82

View File

@ -1086,9 +1086,10 @@ class YoutubeDL(object):
if req_format is None: if req_format is None:
req_format_list = [] req_format_list = []
if (self.params.get('outtmpl', DEFAULT_OUTTMPL) != '-' if (self.params.get('outtmpl', DEFAULT_OUTTMPL) != '-'
and info_dict['extractor'] in ['youtube', 'ted'] and info_dict['extractor'] in ['youtube', 'ted']):
and FFmpegMergerPP(self).available): merger = FFmpegMergerPP(self)
req_format_list.append('bestvideo+bestaudio') if merger.available and not merger.check_outdated():
req_format_list.append('bestvideo+bestaudio')
req_format_list.append('best') req_format_list.append('best')
req_format = '/'.join(req_format_list) req_format = '/'.join(req_format_list)
formats_to_download = [] formats_to_download = []