From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Thu, 17 Jul 2014 07:21:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'adammw/adultswim'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=b1d65c33695feec76a801b7647fe8077869c25ad;hp=-c;p=youtube-dl

Merge remote-tracking branch 'adammw/adultswim'
---

b1d65c33695feec76a801b7647fe8077869c25ad
diff --combined youtube_dl/extractor/__init__.py
index c5961cab9,5f9ae7a3e..3e3b5d44a
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -1,9 -1,9 +1,10 @@@
  from .academicearth import AcademicEarthCourseIE
  from .addanime import AddAnimeIE
+ from .adultswim import AdultSwimIE
  from .aftonbladet import AftonbladetIE
  from .anitube import AnitubeIE
  from .aol import AolIE
 +from .allocine import AllocineIE
  from .aparat import AparatIE
  from .appletrailers import AppleTrailersIE
  from .archiveorg import ArchiveOrgIE
@@@ -64,7 -64,6 +65,7 @@@ from .dailymotion import 
  from .daum import DaumIE
  from .dotsub import DotsubIE
  from .dreisat import DreiSatIE
 +from .drtv import DRTVIE
  from .defense import DefenseGouvFrIE
  from .discovery import DiscoveryIE
  from .divxstage import DivxStageIE
@@@ -83,7 -82,6 +84,7 @@@ from .extremetube import ExtremeTubeI
  from .facebook import FacebookIE
  from .faz import FazIE
  from .fc2 import FC2IE
 +from .firedrive import FiredriveIE
  from .firstpost import FirstpostIE
  from .firsttv import FirstTVIE
  from .fivemin import FiveMinIE
@@@ -106,15 -104,12 +107,15 @@@ from .freesound import FreesoundI
  from .freespeech import FreespeechIE
  from .funnyordie import FunnyOrDieIE
  from .gamekings import GamekingsIE
 +from .gameone import GameOneIE
  from .gamespot import GameSpotIE
  from .gametrailers import GametrailersIE
  from .gdcvault import GDCVaultIE
  from .generic import GenericIE
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
 +from .gorillavid import GorillaVidIE
 +from .goshgay import GoshgayIE
  from .hark import HarkIE
  from .helsinki import HelsinkiIE
  from .hentaistigma import HentaiStigmaIE
@@@ -148,15 -143,10 +149,15 @@@ from .khanacademy import KhanAcademyI
  from .kickstarter import KickStarterIE
  from .keek import KeekIE
  from .kontrtube import KontrTubeIE
 +from .ku6 import Ku6IE
  from .la7 import LA7IE
  from .lifenews import LifeNewsIE
  from .liveleak import LiveLeakIE
 -from .livestream import LivestreamIE, LivestreamOriginalIE
 +from .livestream import (
 +    LivestreamIE,
 +    LivestreamOriginalIE,
 +    LivestreamShortenerIE,
 +)
  from .lynda import (
      LyndaIE,
      LyndaCourseIE
@@@ -170,18 -160,15 +171,18 @@@ from .metacafe import MetacafeI
  from .metacritic import MetacriticIE
  from .mit import TechTVMITIE, MITIE, OCWMITIE
  from .mixcloud import MixcloudIE
 +from .mlb import MLBIE
  from .mpora import MporaIE
  from .mofosex import MofosexIE
  from .mooshare import MooshareIE
  from .morningstar import MorningstarIE
 +from .motherless import MotherlessIE
  from .motorsport import MotorsportIE
  from .moviezine import MoviezineIE
  from .movshare import MovShareIE
  from .mtv import (
      MTVIE,
 +    MTVServicesEmbeddedIE,
      MTVIggyIE,
  )
  from .musicplayon import MusicPlayOnIE
@@@ -208,11 -195,7 +209,11 @@@ from .normalboots import NormalbootsI
  from .novamov import NovaMovIE
  from .nowness import NownessIE
  from .nowvideo import NowVideoIE
 -from .nrk import NRKIE
 +from .npo import NPOIE
 +from .nrk import (
 +    NRKIE,
 +    NRKTVIE,
 +)
  from .ntv import NTVIE
  from .nytimes import NYTimesIE
  from .nuvid import NuvidIE
@@@ -230,10 -213,8 +231,10 @@@ from .pornotube import PornotubeI
  from .prosiebensat1 import ProSiebenSat1IE
  from .pyvideo import PyvideoIE
  from .radiofrance import RadioFranceIE
 +from .rai import RaiIE
  from .rbmaradio import RBMARadioIE
  from .redtube import RedTubeIE
 +from .reverbnation import ReverbNationIE
  from .ringtv import RingTVIE
  from .ro220 import Ro220IE
  from .rottentomatoes import RottenTomatoesIE
@@@ -242,7 -223,6 +243,7 @@@ from .rtbf import RTBFI
  from .rtlnow import RTLnowIE
  from .rts import RTSIE
  from .rtve import RTVEALaCartaIE
 +from .ruhd import RUHDIE
  from .rutube import (
      RutubeIE,
      RutubeChannelIE,
@@@ -252,7 -232,6 +253,7 @@@
  from .rutv import RUTVIE
  from .savefrom import SaveFromIE
  from .scivee import SciVeeIE
 +from .screencast import ScreencastIE
  from .servingsys import ServingSysIE
  from .sina import SinaIE
  from .slideshare import SlideshareIE
@@@ -270,33 -249,23 +271,33 @@@ from .soundcloud import 
      SoundcloudUserIE,
      SoundcloudPlaylistIE
  )
 -from .southparkstudios import (
 -    SouthParkStudiosIE,
 +from .soundgasm import SoundgasmIE
 +from .southpark import (
 +    SouthParkIE,
      SouthparkDeIE,
  )
  from .space import SpaceIE
  from .spankwire import SpankwireIE
  from .spiegel import SpiegelIE
 +from .spiegeltv import SpiegeltvIE
  from .spike import SpikeIE
  from .stanfordoc import StanfordOpenClassroomIE
  from .steam import SteamIE
  from .streamcloud import StreamcloudIE
  from .streamcz import StreamCZIE
 +from .swrmediathek import SWRMediathekIE
  from .syfy import SyfyIE
  from .sztvhu import SztvHuIE
 +from .tagesschau import TagesschauIE
 +from .teachertube import (
 +    TeacherTubeIE,
 +    TeacherTubeUserIE,
 +)
 +from .teachingchannel import TeachingChannelIE
  from .teamcoco import TeamcocoIE
  from .techtalks import TechTalksIE
  from .ted import TEDIE
 +from .tenplay import TenPlayIE
  from .testurl import TestURLIE
  from .tf1 import TF1IE
  from .theplatform import ThePlatformIE
@@@ -326,7 -295,6 +327,7 @@@ from .veehd import VeeHDI
  from .veoh import VeohIE
  from .vesti import VestiIE
  from .vevo import VevoIE
 +from .vh1 import VH1IE
  from .viddler import ViddlerIE
  from .videobam import VideoBamIE
  from .videodetective import VideoDetectiveIE
@@@ -344,17 -312,14 +345,17 @@@ from .vimeo import 
      VimeoReviewIE,
      VimeoWatchLaterIE,
  )
 +from .vimple import VimpleIE
  from .vine import (
      VineIE,
      VineUserIE,
  )
  from .viki import VikiIE
  from .vk import VKIE
 +from .vodlocker import VodlockerIE
  from .vube import VubeIE
  from .vuclip import VuClipIE
 +from .vulture import VultureIE
  from .washingtonpost import WashingtonPostIE
  from .wat import WatIE
  from .wdr import (
@@@ -366,7 -331,6 +367,7 @@@ from .weibo import WeiboI
  from .wimp import WimpIE
  from .wistia import WistiaIE
  from .worldstarhiphop import WorldStarHipHopIE
 +from .wrzuta import WrzutaIE
  from .xbef import XBefIE
  from .xhamster import XHamsterIE
  from .xnxx import XNXXIE