From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Mon, 6 Jul 2015 08:08:30 +0000 (+0800)
Subject: Merge branch 'qqmusic-playlist' of https://github.com/ping/youtube-dl into ping-qqmus... 
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=d80891efc47d3965695f76a24694c1f0bd748bd6;hp=-c;p=youtube-dl

Merge branch 'qqmusic-playlist' of https://github.com/ping/youtube-dl into ping-qqmusic-playlist
---

d80891efc47d3965695f76a24694c1f0bd748bd6
diff --combined youtube_dl/extractor/__init__.py
index aba62db53,d03577cdf..f7c1f07a4
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -4,10 -4,7 +4,10 @@@ from .abc import ABCI
  from .abc7news import Abc7NewsIE
  from .academicearth import AcademicEarthCourseIE
  from .addanime import AddAnimeIE
 -from .adobetv import AdobeTVIE
 +from .adobetv import (
 +    AdobeTVIE,
 +    AdobeTVVideoIE,
 +)
  from .adultswim import AdultSwimIE
  from .aftenposten import AftenpostenIE
  from .aftonbladet import AftonbladetIE
@@@ -106,7 -103,6 +106,7 @@@ from .dailymotion import 
      DailymotionIE,
      DailymotionPlaylistIE,
      DailymotionUserIE,
 +    DailymotionCloudIE,
  )
  from .daum import DaumIE
  from .dbtv import DBTVIE
@@@ -144,6 -140,7 +144,6 @@@ from .ellentv import 
  )
  from .elpais import ElPaisIE
  from .embedly import EmbedlyIE
 -from .empflix import EMPFlixIE
  from .engadget import EngadgetIE
  from .eporner import EpornerIE
  from .eroprofile import EroProfileIE
@@@ -387,7 -384,6 +387,7 @@@ from .nytimes import 
  from .nuvid import NuvidIE
  from .odnoklassniki import OdnoklassnikiIE
  from .oktoberfesttv import OktoberfestTVIE
 +from .onionstudios import OnionStudiosIE
  from .ooyala import (
      OoyalaIE,
      OoyalaExternalIE,
@@@ -405,7 -401,6 +405,7 @@@ from .pbs import PBSI
  from .philharmoniedeparis import PhilharmonieDeParisIE
  from .phoenix import PhoenixIE
  from .photobucket import PhotobucketIE
 +from .pinkbike import PinkbikeIE
  from .planetaplay import PlanetaPlayIE
  from .pladform import PladformIE
  from .played import PlayedIE
@@@ -432,6 -427,7 +432,7 @@@ from .qqmusic import 
      QQMusicSingerIE,
      QQMusicAlbumIE,
      QQMusicToplistIE,
+     QQMusicPlaylistIE,
  )
  from .quickvid import QuickVidIE
  from .r7 import R7IE
@@@ -492,10 -488,6 +493,10 @@@ from .smotri import 
      SmotriUserIE,
      SmotriBroadcastIE,
  )
 +from .snagfilms import (
 +    SnagFilmsIE,
 +    SnagFilmsEmbedIE,
 +)
  from .snotr import SnotrIE
  from .sohu import SohuIE
  from .soompi import (
@@@ -569,7 -561,6 +570,7 @@@ from .tf1 import TF1I
  from .theonion import TheOnionIE
  from .theplatform import ThePlatformIE
  from .thesixtyone import TheSixtyOneIE
 +from .thisamericanlife import ThisAmericanLifeIE
  from .thisav import ThisAVIE
  from .tinypic import TinyPicIE
  from .tlc import TlcIE, TlcDeIE
@@@ -577,11 -568,7 +578,11 @@@ from .tmz import 
      TMZIE,
      TMZArticleIE,
  )
 -from .tnaflix import TNAFlixIE
 +from .tnaflix import (
 +    TNAFlixIE,
 +    EMPFlixIE,
 +    MovieFapIE,
 +)
  from .thvideo import (
      THVideoIE,
      THVideoPlaylistIE
@@@ -625,7 -612,6 +626,7 @@@ from .twitch import 
      TwitchBookmarksIE,
      TwitchStreamIE,
  )
 +from .twitter import TwitterCardIE
  from .ubu import UbuIE
  from .udemy import (
      UdemyIE,
@@@ -711,10 -697,7 +712,10 @@@ from .wrzuta import WrzutaI
  from .wsj import WSJIE
  from .xbef import XBefIE
  from .xboxclips import XboxClipsIE
 -from .xhamster import XHamsterIE
 +from .xhamster import (
 +    XHamsterIE,
 +    XHamsterEmbedIE,
 +)
  from .xminus import XMinusIE
  from .xnxx import XNXXIE
  from .xstream import XstreamIE