diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-09-16 03:32:53 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-09-16 03:32:53 +0200 |
| commit | ef66b0c6effb9d8741807abb12b059560c97c8da (patch) | |
| tree | 8230663fc475477863b78884078bba918a1edea4 /youtube_dl/extractor/__init__.py | |
| parent | 22b50ecb2f7f9e0469d281a4c401d4a531c1cc5b (diff) | |
| parent | 5a6fecc3dee35f95f3590a31e51670819db5a1fe (diff) | |
| download | youtube-dl-ef66b0c6effb9d8741807abb12b059560c97c8da.tar.xz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
| -rw-r--r-- | youtube_dl/extractor/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 26cf24935..246f1e8b5 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -52,6 +52,7 @@ from .jeuxvideo import JeuxVideoIE from .jukebox import JukeboxIE from .justintv import JustinTVIE from .kankan import KankanIE +from .kickstarter import KickStarterIE from .keek import KeekIE from .liveleak import LiveLeakIE from .livestream import LivestreamIE @@ -81,7 +82,8 @@ from .sina import SinaIE from .slashdot import SlashdotIE from .slideshare import SlideshareIE from .sohu import SohuIE -from .soundcloud import SoundcloudIE, SoundcloudSetIE +from .soundcloud import SoundcloudIE, SoundcloudSetIE, SoundcloudUserIE +from .southparkstudios import SouthParkStudiosIE from .spiegel import SpiegelIE from .stanfordoc import StanfordOpenClassroomIE from .statigram import StatigramIE @@ -96,7 +98,7 @@ from .tudou import TudouIE from .tumblr import TumblrIE from .tutv import TutvIE from .unistra import UnistraIE -from .ustream import UstreamIE +from .ustream import UstreamIE, UstreamChannelIE from .vbox7 import Vbox7IE from .veehd import VeeHDIE from .veoh import VeohIE |