|
|
@ -1104,7 +1104,8 @@ 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) != '-' and
|
|
|
|
if (self.params.get('outtmpl', DEFAULT_OUTTMPL) != '-' and
|
|
|
|
info_dict['extractor'] in ['youtube', 'ted']):
|
|
|
|
info_dict['extractor'] in ['youtube', 'ted'] and
|
|
|
|
|
|
|
|
not info_dict.get('is_live')):
|
|
|
|
merger = FFmpegMergerPP(self)
|
|
|
|
merger = FFmpegMergerPP(self)
|
|
|
|
if merger.available and merger.can_merge():
|
|
|
|
if merger.available and merger.can_merge():
|
|
|
|
req_format_list.append('bestvideo+bestaudio')
|
|
|
|
req_format_list.append('bestvideo+bestaudio')
|
|
|
|