diff options
author | Allan Zhou <allanzp@gmail.com> | 2013-08-19 17:11:52 -0700 |
---|---|---|
committer | Allan Zhou <allanzp@gmail.com> | 2013-08-19 17:11:52 -0700 |
commit | 90d3989b99c7a9446089ea635ca288216625d44c (patch) | |
tree | 5ae78d1cc8de87eaf361aea5fd069b84d3154fd7 /youtube_dl/extractor/__init__.py | |
parent | 95fdc7d69cec1381382cea33f0e4e06c8045486d (diff) | |
parent | d741e55a423a09c40b3c5e19551f432a050353d7 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
-rw-r--r-- | youtube_dl/extractor/__init__.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index c20172a53..5bb44e764 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -45,15 +45,18 @@ from .livestream import LivestreamIE from .metacafe import MetacafeIE from .mixcloud import MixcloudIE from .mtv import MTVIE +from .muzu import MuzuTVIE from .myspass import MySpassIE from .myvideo import MyVideoIE from .nba import NBAIE +from .ooyala import OoyalaIE 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 .soundcloud import SoundcloudIE, SoundcloudSetIE from .spiegel import SpiegelIE @@ -72,6 +75,7 @@ from .ustream import UstreamIE from .vbox7 import Vbox7IE from .veoh import VeohIE from .vevo import VevoIE +from .videofyme import VideofyMeIE from .vimeo import VimeoIE, VimeoChannelIE from .vine import VineIE from .c56 import C56IE |