From: Sergey M․ <dstftw@gmail.com>
Date: Tue, 17 Mar 2015 15:41:25 +0000 (+0600)
Subject: Merge branch 'douyutv' of https://github.com/bonfy/youtube-dl into bonfy-douyutv
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=674fb0fcc54c72448f80a0573f7fd116f220827e;hp=-c

Merge branch 'douyutv' of https://github.com/bonfy/youtube-dl into bonfy-douyutv
---

674fb0fcc54c72448f80a0573f7fd116f220827e
diff --combined youtube_dl/extractor/__init__.py
index bceed92e1,7d0798176..f3901bfc3
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -37,7 -37,6 +37,7 @@@ from .bandcamp import BandcampIE, Bandc
  from .bbccouk import BBCCoUkIE
  from .beeg import BeegIE
  from .behindkink import BehindKinkIE
 +from .beatportpro import BeatportProIE
  from .bet import BetIE
  from .bild import BildIE
  from .bilibili import BiliBiliIE
@@@ -107,6 -106,7 +107,7 @@@ from .dctp import DctpTvI
  from .deezer import DeezerPlaylistIE
  from .dfb import DFBIE
  from .dotsub import DotsubIE
+ from .douyutv import DouyutvIE
  from .dreisat import DreiSatIE
  from .drbonanza import DRBonanzaIE
  from .drtuber import DrTuberIE
@@@ -117,7 -117,6 +118,7 @@@ from .defense import DefenseGouvFrI
  from .discovery import DiscoveryIE
  from .divxstage import DivxStageIE
  from .dropbox import DropboxIE
 +from .eagleplatform import EaglePlatformIE
  from .ebaumsworld import EbaumsWorldIE
  from .echomsk import EchoMskIE
  from .ehow import EHowIE
@@@ -152,7 -151,6 +153,7 @@@ from .fktv import 
  )
  from .flickr import FlickrIE
  from .folketinget import FolketingetIE
 +from .footyroom import FootyRoomIE
  from .fourtube import FourTubeIE
  from .foxgay import FoxgayIE
  from .foxnews import FoxNewsIE
@@@ -177,7 -175,6 +178,7 @@@ from .gameone import 
  from .gamespot import GameSpotIE
  from .gamestar import GameStarIE
  from .gametrailers import GametrailersIE
 +from .gazeta import GazetaIE
  from .gdcvault import GDCVaultIE
  from .generic import GenericIE
  from .giantbomb import GiantBombIE
@@@ -232,7 -229,6 +233,7 @@@ from .jove import JoveI
  from .jukebox import JukeboxIE
  from .jpopsukitv import JpopsukiIE
  from .kaltura import KalturaIE
 +from .kanalplay import KanalPlayIE
  from .kankan import KankanIE
  from .karaoketv import KaraoketvIE
  from .keezmovies import KeezMoviesIE
@@@ -359,7 -355,6 +360,7 @@@ from .orf import 
      ORFTVthekIE,
      ORFOE1IE,
      ORFFM4IE,
 +    ORFIPTVIE,
  )
  from .parliamentliveuk import ParliamentLiveUKIE
  from .patreon import PatreonIE
@@@ -367,11 -362,9 +368,11 @@@ from .pbs import PBSI
  from .phoenix import PhoenixIE
  from .photobucket import PhotobucketIE
  from .planetaplay import PlanetaPlayIE
 +from .pladform import PladformIE
  from .played import PlayedIE
  from .playfm import PlayFMIE
  from .playvid import PlayvidIE
 +from .playwire import PlaywireIE
  from .podomatic import PodomaticIE
  from .pornhd import PornHdIE
  from .pornhub import (
@@@ -380,7 -373,6 +381,7 @@@
  )
  from .pornotube import PornotubeIE
  from .pornoxo import PornoXOIE
 +from .primesharetv import PrimeShareTVIE
  from .promptfile import PromptFileIE
  from .prosiebensat1 import ProSiebenSat1IE
  from .puls4 import Puls4IE
@@@ -406,7 -398,7 +407,7 @@@ from .rtlnow import RTLnowI
  from .rtl2 import RTL2IE
  from .rtp import RTPIE
  from .rts import RTSIE
 -from .rtve import RTVEALaCartaIE, RTVELiveIE
 +from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE
  from .ruhd import RUHDIE
  from .rutube import (
      RutubeIE,
@@@ -464,7 -456,6 +465,7 @@@ from .sport5 import Sport5I
  from .sportbox import SportBoxIE
  from .sportdeutschland import SportDeutschlandIE
  from .srmediathek import SRMediathekIE
 +from .ssa import SSAIE
  from .stanfordoc import StanfordOpenClassroomIE
  from .steam import SteamIE
  from .streamcloud import StreamcloudIE
@@@ -560,7 -551,6 +561,7 @@@ from .videoweed import VideoWeedI
  from .vidme import VidmeIE
  from .vidzi import VidziIE
  from .vier import VierIE, VierVideosIE
 +from .viewster import ViewsterIE
  from .vimeo import (
      VimeoIE,
      VimeoAlbumIE,
@@@ -617,11 -607,6 +618,11 @@@ from .yahoo import 
      YahooSearchIE,
  )
  from .yam import YamIE
 +from .yandexmusic import (
 +    YandexMusicTrackIE,
 +    YandexMusicAlbumIE,
 +    YandexMusicPlaylistIE,
 +)
  from .yesjapan import YesJapanIE
  from .ynet import YnetIE
  from .youjizz import YouJizzIE