aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/YoutubeDL.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-02-13 00:23:14 +0600
committerSergey M․ <dstftw@gmail.com>2016-02-13 00:23:14 +0600
commit4c77d3f52ad16d9d9ac0ff0f15a62beef3158ca4 (patch)
tree3f883c76d5e37b8442bb2d59ad385734e75d58fb /youtube_dl/YoutubeDL.py
parent7be747b921f0e31f4db3db2fd7e1c90d265ed566 (diff)
[YoutubeDL] Allow bestvideo+bestaudio for any extractor
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
-rwxr-xr-xyoutube_dl/YoutubeDL.py1
1 files changed, 0 insertions, 1 deletions
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():