aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/__init__.py
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2015-12-21 04:31:17 +0100
committerremitamine <remitamine@gmail.com>2015-12-21 04:31:17 +0100
commit7ba71e30fb9ec188d122f79a914f688928e80e91 (patch)
tree96864d5499f2024c3483a9d4970a1e6273bb90c5 /youtube_dl/extractor/__init__.py
parenta8ae232fa9c24534bd9c838c793f182e6796fe4e (diff)
parent7cb09524749d4a061acc801d0a2d6ad08463e549 (diff)
Merge branch 'bliptv' of github.com:remitamine/youtube-dl into remitamine-bliptv
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
-rw-r--r--youtube_dl/extractor/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index e7b536df0..add1df023 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -62,7 +62,6 @@ from .bet import BetIE
from .bild import BildIE
from .bilibili import BiliBiliIE
from .blinkx import BlinkxIE
-from .bliptv import BlipTVIE, BlipTVUserIE
from .bloomberg import BloombergIE
from .bpb import BpbIE
from .br import BRIE
@@ -282,6 +281,7 @@ from .jadorecettepub import JadoreCettePubIE
from .jeuxvideo import JeuxVideoIE
from .jove import JoveIE
from .jukebox import JukeboxIE
+from .jwplatform import JWPlatformIE
from .jpopsukitv import JpopsukiIE
from .kaltura import KalturaIE
from .kanalplay import KanalPlayIE
@@ -336,6 +336,7 @@ from .lynda import (
from .m6 import M6IE
from .macgamestore import MacGameStoreIE
from .mailru import MailRuIE
+from .makertv import MakerTVIE
from .malemotion import MalemotionIE
from .mdr import MDRIE
from .metacafe import MetacafeIE