Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2024-11-22 01:13:00 +08:00
Code Issues Releases Wiki Activity

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

Browse Source 
[YoutubeDL] Do not force bestvideo+bestaudio when outtmpl is stdout
This commit is contained in:
Sergey M. 2015-05-08 22:01:50 +05:00
commit d47e980d0d
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)