diff options
| author | Yen Chi Hsuan <yan12125@gmail.com> | 2015-07-23 00:39:44 +0800 |
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2015-07-23 00:39:44 +0800 |
| commit | 3a99d321a8b7d1efc85199fe06f192118ad4bf2e (patch) | |
| tree | ca75a69aeae53cd48481518429862b330ae87723 /youtube_dl | |
| parent | 4bb3d999aca4f51e5530a8779ee876c008339609 (diff) | |
| parent | 8250c32f49fed0986bd514d1435e00a0182e8314 (diff) | |
Merge pull request #6303 from jaimeMF/dash_no_live
[YoutubeDL] don't default to 'bestvideo+bestaudio/best' for live videos
Diffstat (limited to 'youtube_dl')
| -rwxr-xr-x | youtube_dl/YoutubeDL.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 00af78e06..702a6ad50 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -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') |