diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2014-12-30 19:41:04 +0100 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2014-12-30 19:41:04 +0100 |
commit | b3013681ff49712d5b5437efdff117ca544caadb (patch) | |
tree | 442d601fca73f070e9ac0e6ef2b9770c71d03f88 /youtube_dl/extractor/__init__.py | |
parent | 416c7fcbce86324587afae11414c71ff603ad296 (diff) | |
parent | e83eebb12f984c1614204e53c09dc5124b52b45c (diff) | |
download | youtube-dl-b3013681ff49712d5b5437efdff117ca544caadb.tar.xz |
Merge remote-tracking branch 'origin/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 ab0f76862..c15786ad7 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -25,6 +25,7 @@ from .arte import ( ArteTVDDCIE, ArteTVEmbedIE, ) +from .atresplayer import AtresPlayerIE from .audiomack import AudiomackIE from .auengine import AUEngineIE from .azubu import AzubuIE @@ -169,8 +170,10 @@ from .grooveshark import GroovesharkIE from .groupon import GrouponIE from .hark import HarkIE from .heise import HeiseIE +from .hellporno import HellPornoIE from .helsinki import HelsinkiIE from .hentaistigma import HentaiStigmaIE +from .hitbox import HitboxIE, HitboxLiveIE from .hornbunny import HornBunnyIE from .hostingbulk import HostingBulkIE from .hotnewhiphop import HotNewHipHopIE @@ -515,6 +518,7 @@ from .xminus import XMinusIE from .xnxx import XNXXIE from .xvideos import XVideosIE from .xtube import XTubeUserIE, XTubeIE +from .xxxymovies import XXXYMoviesIE from .yahoo import ( YahooIE, YahooSearchIE, |