From: remitamine Date: Mon, 21 Dec 2015 03:31:17 +0000 (+0100) Subject: Merge branch 'bliptv' of github.com:remitamine/youtube-dl into remitamine-bliptv X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=7ba71e30fb9ec188d122f79a914f688928e80e91;p=youtube-dl Merge branch 'bliptv' of github.com:remitamine/youtube-dl into remitamine-bliptv --- 7ba71e30fb9ec188d122f79a914f688928e80e91 diff --cc youtube_dl/extractor/generic.py index 7cf13fddf,f5dd88f54..3c3066e38 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@@ -54,8 -53,7 +53,9 @@@ from .onionstudios import OnionStudiosI from .snagfilms import SnagFilmsEmbedIE from .screenwavemedia import ScreenwaveMediaIE from .mtv import MTVServicesEmbeddedIE +from .pladform import PladformIE +from .googledrive import GoogleDriveIE + from .jwplatform import JWPlatformIE class GenericIE(InfoExtractor):