浏览代码

Merge pull request #5641 from dstftw/preserve-best-for-stdout-outtmpl

[YoutubeDL] Do not force bestvideo+bestaudio when outtmpl is stdout
Sergey M. 10 年之前
父节点
当前提交
d47e980d0d
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      youtube_dl/YoutubeDL.py

+ 3 - 1
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)