projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
553e412
)
[YoutubeDL] Do not force bestvideo+bestaudio when outtmpl is stdout (#5627)
author
Sergey M․
<dstftw@gmail.com>
Thu, 7 May 2015 14:46:11 +0000
(20:46 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Thu, 7 May 2015 14:46:11 +0000
(20:46 +0600)
youtube_dl/YoutubeDL.py
patch
|
blob
|
history
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index eb7470f72cd39572071b6624180d4d2e0c08cbda..d8583a8eb4db5c6589e12e6497cc66e7171c30c8 100755
(executable)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-1086,7
+1086,9
@@
class YoutubeDL(object):
req_format = self.params.get('format')
if req_format is None:
req_format_list = []
req_format = self.params.get('format')
if req_format is None:
req_format_list = []
- if info_dict['extractor'] in ['youtube', 'ted'] and FFmpegMergerPP(self).available:
+ if (self.params.get('outtmpl', DEFAULT_OUTTMPL) != '-'
+ and info_dict['extractor'] in ['youtube', 'ted']
+ and FFmpegMergerPP(self).available):
req_format_list.append('bestvideo+bestaudio')
req_format_list.append('best')
req_format = '/'.join(req_format_list)
req_format_list.append('bestvideo+bestaudio')
req_format_list.append('best')
req_format = '/'.join(req_format_list)