aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorSergey M. <dstftw@gmail.com>2015-05-08 22:01:50 +0500
committerSergey M. <dstftw@gmail.com>2015-05-08 22:01:50 +0500
commitd47e980d0de4aeeca757433365836b61c2ee9f9f (patch)
treedc272d0e7731d6c0b8bce7bcc675603d87d01351 /youtube_dl
parentfe373287ebdda002ed84dca1d8b9d6f8a5686138 (diff)
parent3799834dcff27ffeea66e3ec96166f8da8fa73ab (diff)
Merge pull request #5641 from dstftw/preserve-best-for-stdout-outtmpl
[YoutubeDL] Do not force bestvideo+bestaudio when outtmpl is stdout
Diffstat (limited to 'youtube_dl')
-rwxr-xr-xyoutube_dl/YoutubeDL.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index eb7470f72..d8583a8eb 100755
--- 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)