]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[YoutubeDL] Fallback to `-f best` when merger is outdated
authorSergey M․ <dstftw@gmail.com>
Sun, 10 May 2015 18:27:29 +0000 (00:27 +0600)
committerSergey M․ <dstftw@gmail.com>
Sun, 10 May 2015 18:27:29 +0000 (00:27 +0600)
youtube_dl/YoutubeDL.py

index 4cf83c510496f805da8174707d6b3f37d0aed146..7c3bdb96469a78d6e311d62e4f03557d45ac47a7 100755 (executable)
@@ -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 = []