[YoutubeDL] Make bestvideo+bestaudio/best default format when merger is available

This commit is contained in:
Sergey M․ 2015-04-18 01:14:10 +06:00 committed by Jaime Marquínez Ferrándiz
parent 5b5fbc0867
commit feccf29c87

View file

@ -1091,7 +1091,11 @@ 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 = 'best' req_format_list = []
if info_dict['extractor'] == 'youtube' and FFmpegMergerPP(self).available:
req_format_list.append('bestvideo+bestaudio')
req_format_list.append('best')
req_format = '/'.join(req_format_list)
formats_to_download = [] formats_to_download = []
if req_format == 'all': if req_format == 'all':
formats_to_download = formats formats_to_download = formats