From: Sergey M․ <dstftw@gmail.com>
Date: Thu, 7 May 2015 14:46:11 +0000 (+0600)
Subject: [YoutubeDL] Do not force bestvideo+bestaudio when outtmpl is stdout (#5627)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=3799834dcff27ffeea66e3ec96166f8da8fa73ab;p=youtube-dl

[YoutubeDL] Do not force bestvideo+bestaudio when outtmpl is stdout (#5627)
---

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)