diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-05-11 00:27:29 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-05-11 00:27:29 +0600 |
| commit | 7fcb605b82796e79a5f559624808ca9404df1154 (patch) | |
| tree | 52493ecde36f460888b6810160bcfb254de56435 | |
| parent | 70484b9f8ae629ccb87e8c0569f8f4bf2dfdb0ac (diff) | |
| download | youtube-dl-7fcb605b82796e79a5f559624808ca9404df1154.tar.gz youtube-dl-7fcb605b82796e79a5f559624808ca9404df1154.tar.xz youtube-dl-7fcb605b82796e79a5f559624808ca9404df1154.zip | |
[YoutubeDL] Fallback to `-f best` when merger is outdated
| -rwxr-xr-x | youtube_dl/YoutubeDL.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 4cf83c510..7c3bdb964 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -1086,9 +1086,10 @@ class YoutubeDL(object): if req_format is None: req_format_list = [] if (self.params.get('outtmpl', DEFAULT_OUTTMPL) != '-' - and info_dict['extractor'] in ['youtube', 'ted'] - and FFmpegMergerPP(self).available): - req_format_list.append('bestvideo+bestaudio') + and info_dict['extractor'] in ['youtube', 'ted']): + merger = FFmpegMergerPP(self) + if merger.available and not merger.check_outdated(): + req_format_list.append('bestvideo+bestaudio') req_format_list.append('best') req_format = '/'.join(req_format_list) formats_to_download = [] |