projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
4bb3d99
)
Merge pull request #6303 from jaimeMF/dash_no_live
author
Yen Chi Hsuan
<yan12125@gmail.com>
Wed, 22 Jul 2015 16:39:44 +0000
(
00:39
+0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Wed, 22 Jul 2015 16:39:44 +0000
(
00:39
+0800)
[YoutubeDL] don't default to 'bestvideo+bestaudio/best' for live videos
youtube_dl/YoutubeDL.py
patch
|
blob
|
history
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index 00af78e0600f8d2136116e91bcda179f70dbf9a5..702a6ad50b6c6bf2d3f3bfbd8c873cb3a64c8e7b 100755
(executable)
--- 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')