aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-05-11 02:01:16 +0600
committerSergey M․ <dstftw@gmail.com>2015-05-11 02:01:16 +0600
commit97fcf1bbd07ae0c5b6e530dcf2623d199452a76c (patch)
treea44f95ec2ec060809a7485f896e187d03e37af69
parent13763ce599c8fbba43e57d2d79a9b007cfbd4ced (diff)
[YoutubeDL] Check if merger can actually merge
-rwxr-xr-xyoutube_dl/YoutubeDL.py2
1 files changed, 1 insertions, 1 deletions
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)