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

diff --combined youtube_dl/extractor/__init__.py
index a64b457bd6fac7b129907d34e4699c8042d111b9,c8692ffa942bbf14b18824569b5af8ca9a482bb7..d886f7d68bce176bf641dd79445ef09b690cde7e
--- 1/youtube_dl/extractor/__init__.py
--- 2/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
@@@ -323,7 -320,6 +323,7 @@@ from .musicvault import MusicVaultI
  from .muzu import MuzuTVIE
  from .myspace import MySpaceIE, MySpaceAlbumIE
  from .myspass import MySpassIE
 +from .myvi import MyviIE
  from .myvideo import MyVideoIE
  from .myvidster import MyVidsterIE
  from .nationalgeographic import NationalGeographicIE
@@@ -343,6 -339,15 +343,15 @@@ from .ndtv import NDTVI
  from .netzkino import NetzkinoIE
  from .nerdcubed import NerdCubedFeedIE
  from .nerdist import NerdistIE
+ from .neteasemusic import (
+     NetEaseMusicIE,
+     NetEaseMusicAlbumIE,
+     NetEaseMusicSingerIE,
+     NetEaseMusicListIE,
+     NetEaseMusicMvIE,
+     NetEaseMusicProgramIE,
+     NetEaseMusicDjRadioIE,
+ )
  from .newgrounds import NewgroundsIE
  from .newstube import NewstubeIE
  from .nextmedia import (
@@@ -388,7 -393,6 +397,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,
@@@ -433,7 -437,6 +442,7 @@@ from .qqmusic import 
      QQMusicSingerIE,
      QQMusicAlbumIE,
      QQMusicToplistIE,
 +    QQMusicPlaylistIE,
  )
  from .quickvid import QuickVidIE
  from .r7 import R7IE
@@@ -494,10 -497,6 +503,10 @@@ from .smotri import 
      SmotriUserIE,
      SmotriBroadcastIE,
  )
 +from .snagfilms import (
 +    SnagFilmsIE,
 +    SnagFilmsEmbedIE,
 +)
  from .snotr import SnotrIE
  from .sohu import SohuIE
  from .soompi import (
@@@ -571,7 -570,6 +580,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
@@@ -579,11 -577,7 +588,11 @@@ from .tmz import 
      TMZIE,
      TMZArticleIE,
  )
 -from .tnaflix import TNAFlixIE
 +from .tnaflix import (
 +    TNAFlixIE,
 +    EMPFlixIE,
 +    MovieFapIE,
 +)
  from .thvideo import (
      THVideoIE,
      THVideoPlaylistIE
@@@ -627,7 -621,6 +636,7 @@@ from .twitch import 
      TwitchBookmarksIE,
      TwitchStreamIE,
  )
 +from .twitter import TwitterCardIE
  from .ubu import UbuIE
  from .udemy import (
      UdemyIE,
@@@ -713,10 -706,7 +722,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
@@@ -735,7 -725,6 +744,7 @@@ from .yandexmusic import 
      YandexMusicPlaylistIE,
  )
  from .yesjapan import YesJapanIE
 +from .yinyuetai import YinYueTaiIE
  from .ynet import YnetIE
  from .youjizz import YouJizzIE
  from .youku import YoukuIE