aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/__init__.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2012-09-27 18:55:56 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2012-09-27 18:55:56 +0200
commitebe3f89ea45dc74bbadab10acc27ebf91ddbb736 (patch)
treef7b4703a7ef73c1d4812c0fb2fa4ee398e5bde7b /youtube_dl/__init__.py
parentb5de8af234789e3a202de30a6d9b05c95fe82910 (diff)
parent154b55dae3e611e05b9ae1762f59467d753338c4 (diff)
Merge xnxx.com Support (NSFW). Test URL (SFW): http://video.xnxx.com/video1443330/youtube-dl_testvid_a_and_9829_._and_amp_and_38_
Diffstat (limited to 'youtube_dl/__init__.py')
-rw-r--r--youtube_dl/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 0122f725a..0f9d73c46 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -351,6 +351,7 @@ def gen_extractors():
MixcloudIE(),
StanfordOpenClassroomIE(),
MTVIE(),
+ XNXXIE(),
GenericIE()
]