diff options
author | Sergey M․ <dstftw@gmail.com> | 2015-04-18 01:14:10 +0600 |
---|---|---|
committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2015-04-19 17:51:56 +0200 |
commit | feccf29c876869f44a9c983977371073b9801a51 (patch) | |
tree | f46dc1d0b93caebf7f0e7ac8c74906505a3f3951 /youtube_dl/YoutubeDL.py | |
parent | 5b5fbc0867f0eb73416c10c9d692fceee92b5766 (diff) |
[YoutubeDL] Make `bestvideo+bestaudio/best` default format when merger is available
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
-rwxr-xr-x | youtube_dl/YoutubeDL.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 28cf1662e..e5d497b3f 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -1091,7 +1091,11 @@ class YoutubeDL(object): req_format = self.params.get('format') if req_format is None: - req_format = 'best' + req_format_list = [] + if info_dict['extractor'] == 'youtube' and FFmpegMergerPP(self).available: + req_format_list.append('bestvideo+bestaudio') + req_format_list.append('best') + req_format = '/'.join(req_format_list) formats_to_download = [] if req_format == 'all': formats_to_download = formats |