[YoutubeDL] Check if merger can actually merge

This commit is contained in:
Sergey M․ 2015-05-11 02:01:16 +06:00
parent 13763ce599
commit 97fcf1bbd0

View File

@ -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)