diff options
author | Sergey M․ <dstftw@gmail.com> | 2015-05-07 20:46:11 +0600 |
---|---|---|
committer | Sergey M․ <dstftw@gmail.com> | 2015-05-07 20:46:11 +0600 |
commit | 3799834dcff27ffeea66e3ec96166f8da8fa73ab (patch) | |
tree | 68167f020733a7f3c9e48b56016d793e2f49eb92 /youtube_dl/YoutubeDL.py | |
parent | 553e412bda0c2329bd4c6353cd392c50a81bd594 (diff) |
[YoutubeDL] Do not force bestvideo+bestaudio when outtmpl is stdout (#5627)
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
-rwxr-xr-x | youtube_dl/YoutubeDL.py | 4 |
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) |