]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[YoutubeDL] Allow bestvideo+bestaudio for any extractor
authorSergey M․ <dstftw@gmail.com>
Fri, 12 Feb 2016 18:23:14 +0000 (00:23 +0600)
committerSergey M․ <dstftw@gmail.com>
Fri, 12 Feb 2016 18:23:14 +0000 (00:23 +0600)
youtube_dl/YoutubeDL.py

index e5b75f0f5c73d8e99ea17ae61fc9a0b8102d63a5..0072c7d35f3ffc2bdcdef872e8548a4fcc2bc2e9 100755 (executable)
@@ -1341,7 +1341,6 @@ class YoutubeDL(object):
         if req_format is None:
             req_format_list = []
             if (self.params.get('outtmpl', DEFAULT_OUTTMPL) != '-' and
-                    info_dict['extractor'] in ['youtube', 'ted'] and
                     not info_dict.get('is_live')):
                 merger = FFmpegMergerPP(self)
                 if merger.available and merger.can_merge():