diff options
| author | Ismael Mejia <iemejia@gmail.com> | 2013-09-11 14:26:48 +0200 |
|---|---|---|
| committer | Ismael Mejia <iemejia@gmail.com> | 2013-09-11 14:26:48 +0200 |
| commit | cf1dd0c59e8ff4c66130bc47954c415be5db8cc3 (patch) | |
| tree | a39741b945c88b9a7b3bc14c94efdc6fe7b3302f /youtube_dl/extractor/__init__.py | |
| parent | 72836fcee453386f4f16325c5b8fa4c1ba1bb442 (diff) | |
| parent | 22c8b525458c8203c0709a523c646b8d152f03b0 (diff) | |
Merge branch 'master' into subtitles_rework
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
| -rw-r--r-- | youtube_dl/extractor/__init__.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index fbe0b8cb7..26cf24935 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -29,6 +29,10 @@ from .escapist import EscapistIE from .exfm import ExfmIE from .facebook import FacebookIE from .flickr import FlickrIE +from .francetv import ( + PluzzIE, + FranceTvInfoIE, +) from .freesound import FreesoundIE from .funnyordie import FunnyOrDieIE from .gamespot import GameSpotIE @@ -75,6 +79,7 @@ from .roxwel import RoxwelIE from .rtlnow import RTLnowIE from .sina import SinaIE from .slashdot import SlashdotIE +from .slideshare import SlideshareIE from .sohu import SohuIE from .soundcloud import SoundcloudIE, SoundcloudSetIE from .spiegel import SpiegelIE |