fenix
/
ytdl-nightly
mirror of https://github.com/ytdl-org/ytdl-nightly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Sergey M․ 2015-05-07 20:46:11 +06:00
parent 553e412bda
commit 3799834dcf
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/YoutubeDL.py
View File

@ -1086,7 +1086,9 @@ class YoutubeDL(object):
req_format = self.params.get('format') req_format = self.params.get('format')
if req_format is None: if req_format is None:
req_format_list = [] 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('bestvideo+bestaudio')
req_format_list.append('best') req_format_list.append('best')
req_format = '/'.join(req_format_list) req_format = '/'.join(req_format_list)