aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/YoutubeDL.py
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2015-06-16 00:20:52 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2015-06-16 00:20:52 +0800
commit79fe954d79c756f6243036e4927595c43ffaa5b7 (patch)
tree66e40ba2dfc54f3576e036d4dad7e20dcbf4669f /youtube_dl/YoutubeDL.py
parent4fd35ee072a39654f11e794db5c50ee375c9a7c6 (diff)
parent0501bfa159db5b5e8ed7fd1ed966b9989becb3e9 (diff)
downloadyoutube-dl-79fe954d79c756f6243036e4927595c43ffaa5b7.tar.xz
Merge branch 'PeterDing-youku'
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
-rwxr-xr-xyoutube_dl/YoutubeDL.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index aacec2958..6e4b6f566 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -1033,12 +1033,6 @@ class YoutubeDL(object):
info_dict['id'], info_dict.get('subtitles'),
info_dict.get('automatic_captions'))
- # This extractors handle format selection themselves
- if info_dict['extractor'] in ['Youku']:
- if download:
- self.process_info(info_dict)
- return info_dict
-
# We now pick which formats have to be downloaded
if info_dict.get('formats') is None:
# There's only one format available