From: Sergey M․ <dstftw@gmail.com>
Date: Fri, 12 Feb 2016 18:23:14 +0000 (+0600)
Subject: [YoutubeDL] Allow bestvideo+bestaudio for any extractor
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=4c77d3f52ad16d9d9ac0ff0f15a62beef3158ca4;p=youtube-dl

[YoutubeDL] Allow bestvideo+bestaudio for any extractor
---

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index e5b75f0f5..0072c7d35 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -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():