From: Philipp Hagemeister <phihag@phihag.de>
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?p=youtube-dl;a=commitdiff_plain;h=304cbe981e9f3b62288abc54bd84b0eaef286795;hp=-c

Merge remote-tracking branch 'rzhxeo/crunchyroll'
---

304cbe981e9f3b62288abc54bd84b0eaef286795
diff --combined youtube_dl/extractor/__init__.py
index 2aa11fc80,a61e17ea1..a39a1e2f4
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -1,8 -1,5 +1,8 @@@
 -from .appletrailers import AppleTrailersIE
 +from .academicearth import AcademicEarthCourseIE
  from .addanime import AddAnimeIE
 +from .anitube import AnitubeIE
 +from .aparat import AparatIE
 +from .appletrailers import AppleTrailersIE
  from .archiveorg import ArchiveOrgIE
  from .ard import ARDIE
  from .arte import (
@@@ -10,12 -7,9 +10,12 @@@
      ArteTVPlus7IE,
      ArteTVCreativeIE,
      ArteTVFutureIE,
 +    ArteTVDDCIE,
  )
  from .auengine import AUEngineIE
 -from .bandcamp import BandcampIE
 +from .bambuser import BambuserIE, BambuserChannelIE
 +from .bandcamp import BandcampIE, BandcampAlbumIE
 +from .blinkx import BlinkxIE
  from .bliptv import BlipTVIE, BlipTVUserIE
  from .bloomberg import BloombergIE
  from .breakcom import BreakIE
@@@ -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,
@@@ -48,10 -38,8 +49,10 @@@ from .defense import DefenseGouvFrI
  from .ebaumsworld import EbaumsWorldIE
  from .ehow import EHowIE
  from .eighttracks import EightTracksIE
 +from .eitb import EitbIE
  from .escapist import EscapistIE
  from .exfm import ExfmIE
 +from .extremetube import ExtremeTubeIE
  from .facebook import FacebookIE
  from .faz import FazIE
  from .fktv import (
@@@ -62,12 -50,11 +63,12 @@@ from .flickr import FlickrI
  from .francetv import (
      PluzzIE,
      FranceTvInfoIE,
 -    France2IE,
 +    FranceTVIE,
      GenerationQuoiIE
  )
  from .freesound import FreesoundIE
  from .funnyordie import FunnyOrDieIE
 +from .gamekings import GamekingsIE
  from .gamespot import GameSpotIE
  from .gametrailers import GametrailersIE
  from .generic import GenericIE
@@@ -78,15 -65,10 +79,15 @@@ from .hotnewhiphop import HotNewHipHopI
  from .howcast import HowcastIE
  from .hypem import HypemIE
  from .ign import IGNIE, OneUPIE
 +from .imdb import ImdbIE
  from .ina import InaIE
  from .infoq import InfoQIE
  from .instagram import InstagramIE
  from .internetvideoarchive import InternetVideoArchiveIE
 +from .ivi import (
 +    IviIE,
 +    IviCompilationIE
 +)
  from .jeuxvideo import JeuxVideoIE
  from .jukebox import JukeboxIE
  from .justintv import JustinTVIE
@@@ -95,13 -77,11 +96,13 @@@ from .keezmovies import KeezMoviesI
  from .kickstarter import KickStarterIE
  from .keek import KeekIE
  from .liveleak import LiveLeakIE
 -from .livestream import LivestreamIE
 +from .livestream import LivestreamIE, LivestreamOriginalIE
 +from .mdr import MDRIE
  from .metacafe import MetacafeIE
  from .metacritic import MetacriticIE
  from .mit import TechTVMITIE, MITIE
  from .mixcloud import MixcloudIE
 +from .mofosex import MofosexIE
  from .mtv import MTVIE
  from .muzu import MuzuTVIE
  from .myspace import MySpaceIE
@@@ -110,22 -90,15 +111,22 @@@ from .myvideo import MyVideoI
  from .naver import NaverIE
  from .nba import NBAIE
  from .nbc import NBCNewsIE
 +from .ndtv import NDTVIE
  from .newgrounds import NewgroundsIE
  from .nhl import NHLIE, NHLVideocenterIE
 +from .niconico import NiconicoIE
 +from .ninegag import NineGagIE
  from .nowvideo import NowVideoIE
  from .ooyala import OoyalaIE
  from .orf import ORFIE
  from .pbs import PBSIE
  from .photobucket import PhotobucketIE
 +from .podomatic import PodomaticIE
 +from .pornhd import PornHdIE
  from .pornhub import PornHubIE
  from .pornotube import PornotubeIE
 +from .pyvideo import PyvideoIE
 +from .radiofrance import RadioFranceIE
  from .rbmaradio import RBMARadioIE
  from .redtube import RedTubeIE
  from .ringtv import RingTVIE
@@@ -137,40 -110,26 +138,40 @@@ from .rutube import RutubeI
  from .sina import SinaIE
  from .slashdot import SlashdotIE
  from .slideshare import SlideshareIE
 +from .smotri import (
 +    SmotriIE,
 +    SmotriCommunityIE,
 +    SmotriUserIE,
 +    SmotriBroadcastIE,
 +)
  from .sohu import SohuIE
  from .soundcloud import SoundcloudIE, SoundcloudSetIE, SoundcloudUserIE
 -from .southparkstudios import SouthParkStudiosIE
 +from .southparkstudios import (
 +    SouthParkStudiosIE,
 +    SouthparkDeIE,
 +)
 +from .space import SpaceIE
  from .spankwire import SpankwireIE
  from .spiegel import SpiegelIE
  from .stanfordoc import StanfordOpenClassroomIE
  from .statigram import StatigramIE
  from .steam import SteamIE
 +from .streamcloud import StreamcloudIE
  from .sztvhu import SztvHuIE
  from .teamcoco import TeamcocoIE
  from .techtalks import TechTalksIE
  from .ted import TEDIE
  from .tf1 import TF1IE
 +from .theplatform import ThePlatformIE
  from .thisav import ThisAVIE
 +from .toutv import TouTvIE
  from .traileraddict import TrailerAddictIE
  from .trilulilu import TriluliluIE
  from .tube8 import Tube8IE
  from .tudou import TudouIE
  from .tumblr import TumblrIE
  from .tutv import TutvIE
 +from .tvp import TvpIE
  from .unistra import UnistraIE
  from .ustream import UstreamIE, UstreamChannelIE
  from .vbox7 import Vbox7IE
@@@ -182,31 -141,18 +183,31 @@@ from .viddler import ViddlerI
  from .videodetective import VideoDetectiveIE
  from .videofyme import VideofyMeIE
  from .videopremium import VideoPremiumIE
 -from .vimeo import VimeoIE, VimeoChannelIE
 +from .vimeo import (
 +    VimeoIE,
 +    VimeoChannelIE,
 +    VimeoUserIE,
 +    VimeoAlbumIE,
 +    VimeoGroupsIE,
 +)
  from .vine import VineIE
 +from .viki import VikiIE
  from .vk import VKIE
  from .wat import WatIE
  from .websurg import WeBSurgIE
  from .weibo import WeiboIE
  from .wimp import WimpIE
 +from .wistia import WistiaIE
  from .worldstarhiphop import WorldStarHipHopIE
  from .xhamster import XHamsterIE
  from .xnxx import XNXXIE
  from .xvideos import XVideosIE
 -from .yahoo import YahooIE, YahooSearchIE
 +from .xtube import XTubeIE
 +from .yahoo import (
 +    YahooIE,
 +    YahooNewsIE,
 +    YahooSearchIE,
 +)
  from .youjizz import YouJizzIE
  from .youku import YoukuIE
  from .youporn import YouPornIE
@@@ -214,7 -160,6 +215,7 @@@ from .youtube import 
      YoutubeIE,
      YoutubePlaylistIE,
      YoutubeSearchIE,
 +    YoutubeSearchDateIE,
      YoutubeUserIE,
      YoutubeChannelIE,
      YoutubeShowIE,
@@@ -223,8 -168,6 +224,8 @@@
      YoutubeTruncatedURLIE,
      YoutubeWatchLaterIE,
      YoutubeFavouritesIE,
 +    YoutubeHistoryIE,
 +    YoutubeTopListIE,
  )
  from .zdf import ZDFIE