aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/YoutubeDL.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-10-28 10:44:13 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2013-10-28 10:44:13 +0100
commitebc14f251c2968f4cb6cb18610b857ecb24348c8 (patch)
treed33050d96f576d2a9710ccea7fac729116358025 /youtube_dl/YoutubeDL.py
parentd41e6efc852c34da582790a54ecc4f5e9dbbedda (diff)
parent8ffa13e03e995f2009d8240cbdc6ba7aba9d3759 (diff)
downloadyoutube-dl-ebc14f251c2968f4cb6cb18610b857ecb24348c8.tar.xz
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
-rw-r--r--youtube_dl/YoutubeDL.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index e2332f9b8..d4654cc05 100644
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -462,7 +462,7 @@ class YoutubeDL(object):
info_dict['playlist_index'] = None
# This extractors handle format selection themselves
- if info_dict['extractor'] in [u'youtube', u'Youku', u'YouPorn', u'mixcloud']:
+ if info_dict['extractor'] in [u'youtube', u'Youku', u'mixcloud']:
if download:
self.process_info(info_dict)
return info_dict