aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/__init__.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-06-07 15:53:30 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-06-07 15:53:30 +0200
commit6ab8f3584a1cfea1c4b952551cb9b72c05bed29b (patch)
tree016766b484c118a476622327272b2fd8af9b3353 /youtube_dl/extractor/__init__.py
parent8ae5ce17264fde131acd11a454cafe9a32a34bac (diff)
parent34d863f3fc104f58c9fd35298d33714c2c57a9f1 (diff)
downloadyoutube-dl-6ab8f3584a1cfea1c4b952551cb9b72c05bed29b.tar.xz
Merge remote-tracking branch 'ralfharing/vh1'
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
-rw-r--r--youtube_dl/extractor/__init__.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index ace298fb3..01c21189b 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -306,6 +306,12 @@ from .veehd import VeeHDIE
from .veoh import VeohIE
from .vesti import VestiIE
from .vevo import VevoIE
+from .vh1 import (
+ VH1EpisodeIE,
+ VH1ClipIE,
+ VH1ShortUrlIE,
+ VH1MusicVideoIE
+)
from .viddler import ViddlerIE
from .videobam import VideoBamIE
from .videodetective import VideoDetectiveIE