]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[YoutubeDL] Check if merger can actually merge
authorSergey M․ <dstftw@gmail.com>
Sun, 10 May 2015 20:01:16 +0000 (02:01 +0600)
committerSergey M․ <dstftw@gmail.com>
Sun, 10 May 2015 20:01:16 +0000 (02:01 +0600)
youtube_dl/YoutubeDL.py

index 7c3bdb96469a78d6e311d62e4f03557d45ac47a7..00f86b342dfd6bbf14c609353d3c4493719db738 100755 (executable)
@@ -1088,7 +1088,7 @@ class YoutubeDL(object):
             if (self.params.get('outtmpl', DEFAULT_OUTTMPL) != '-'
                     and info_dict['extractor'] in ['youtube', 'ted']):
                 merger = FFmpegMergerPP(self)
-                if merger.available and not merger.check_outdated():
+                if merger.available and merger.can_merge():
                     req_format_list.append('bestvideo+bestaudio')
             req_format_list.append('best')
             req_format = '/'.join(req_format_list)