From: Philipp Hagemeister Date: Fri, 20 Dec 2013 16:13:26 +0000 (+0100) Subject: Merge remote-tracking branch 'rzhxeo/crunchyroll' X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=304cbe981e9f3b62288abc54bd84b0eaef286795;p=youtube-dl Merge remote-tracking branch 'rzhxeo/crunchyroll' --- 304cbe981e9f3b62288abc54bd84b0eaef286795 diff --cc youtube_dl/extractor/__init__.py index 2aa11fc80,a61e17ea1..a39a1e2f4 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@@ -23,18 -17,14 +23,19 @@@ from .brightcove import BrightcoveI from .c56 import C56IE from .canalplus import CanalplusIE from .canalc2 import Canalc2IE +from .cbs import CBSIE +from .channel9 import Channel9IE from .cinemassacre import CinemassacreIE +from .clipfish import ClipfishIE +from .clipsyndicate import ClipsyndicateIE from .cnn import CNNIE from .collegehumor import CollegeHumorIE -from .comedycentral import ComedyCentralIE +from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE from .condenast import CondeNastIE from .criterion import CriterionIE + from .crunchyroll import CrunchyrollIE from .cspan import CSpanIE +from .d8 import D8IE from .dailymotion import ( DailymotionIE, DailymotionPlaylistIE,