Merge pull request #6303 from jaimeMF/dash_no_live

[YoutubeDL] don't default to 'bestvideo+bestaudio/best' for live videos
This commit is contained in:
Yen Chi Hsuan 2015-07-23 00:39:44 +08:00
commit 3a99d321a8

View file

@ -1104,7 +1104,8 @@ class YoutubeDL(object):
if req_format is None:
req_format_list = []
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)
if merger.available and merger.can_merge():
req_format_list.append('bestvideo+bestaudio')