diff options
| author | Pierre Rudloff <pierre@rudloff.pro> | 2013-08-22 12:52:05 +0200 |
|---|---|---|
| committer | Pierre Rudloff <pierre@rudloff.pro> | 2013-08-22 12:52:05 +0200 |
| commit | 8d212e604a86da3c924ab15fe8045ab748a8183d (patch) | |
| tree | 5bc5588e5bbe7f8dad3fb1d0bbba354f2fb9e90c /youtube_dl/extractor/__init__.py | |
| parent | 943f7f7a399c6fb3006eb2bd68070f28a272171f (diff) | |
| parent | 063fcc9676718fc4395b92d6e9665e7f3e9c8156 (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
youtube_dl/extractor/jeuxvideo.py
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
| -rw-r--r-- | youtube_dl/extractor/__init__.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index b9bd3a429..9d12608e1 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -51,13 +51,16 @@ from .myspass import MySpassIE from .myvideo import MyVideoIE from .nba import NBAIE from .ooyala import OoyalaIE +from .pbs import PBSIE from .photobucket import PhotobucketIE from .pornotube import PornotubeIE from .rbmaradio import RBMARadioIE from .redtube import RedTubeIE from .ringtv import RingTVIE from .roxwel import RoxwelIE +from .rtlnow import RTLnowIE from .sina import SinaIE +from .slashdot import SlashdotIE from .soundcloud import SoundcloudIE, SoundcloudSetIE from .spiegel import SpiegelIE from .stanfordoc import StanfordOpenClassroomIE |