From: Sergey M․ Date: Sun, 10 May 2015 20:01:16 +0000 (+0600) Subject: [YoutubeDL] Check if merger can actually merge X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=97fcf1bbd07ae0c5b6e530dcf2623d199452a76c;p=youtube-dl [YoutubeDL] Check if merger can actually merge --- diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 7c3bdb964..00f86b342 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -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)