commit d47e980d0de4aeeca757433365836b61c2ee9f9f
parent fe373287ebdda002ed84dca1d8b9d6f8a5686138
Author: Sergey M <dstftw@gmail.com>
Date: Fri, 8 May 2015 22:01:50 +0500
Merge pull request #5641 from dstftw/preserve-best-for-stdout-outtmpl
[YoutubeDL] Do not force bestvideo+bestaudio when outtmpl is stdout
Diffstat:
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git 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 = []
- 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)