|
|
@ -1085,9 +1085,9 @@ class YoutubeDL(object):
|
|
|
|
req_format = self.params.get('format')
|
|
|
|
req_format = self.params.get('format')
|
|
|
|
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
|
|
|
|
and info_dict['extractor'] in ['youtube', 'ted']
|
|
|
|
info_dict['extractor'] in ['youtube', 'ted'] and
|
|
|
|
and FFmpegMergerPP(self).available):
|
|
|
|
FFmpegMergerPP(self).available):
|
|
|
|
req_format_list.append('bestvideo+bestaudio')
|
|
|
|
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)
|
|
|
|