fenix
/
ytdl-nightly
mirror of https://github.com/ytdl-org/ytdl-nightly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/YoutubeDL.py
View File

@ -1088,7 +1088,7 @@ class YoutubeDL(object):
if (self.params.get('outtmpl', DEFAULT_OUTTMPL) != '-' if (self.params.get('outtmpl', DEFAULT_OUTTMPL) != '-'
and info_dict['extractor'] in ['youtube', 'ted']): and info_dict['extractor'] in ['youtube', 'ted']):
merger = FFmpegMergerPP(self) 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('bestvideo+bestaudio')
req_format_list.append('best') req_format_list.append('best')
req_format = '/'.join(req_format_list) req_format = '/'.join(req_format_list)