From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Wed, 3 Jun 2015 15:59:52 +0000 (+0800)
Subject: Merge branch 'iqiyi' of https://github.com/PeterDing/youtube-dl into PeterDing-iqiyi
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=9bac8c57e3db49c6639c115478a36dde8d465ea7;hp=-c;p=youtube-dl

Merge branch 'iqiyi' of https://github.com/PeterDing/youtube-dl into PeterDing-iqiyi
---

9bac8c57e3db49c6639c115478a36dde8d465ea7
diff --combined youtube_dl/extractor/__init__.py
index 67eb96057,85c1b1a3a..be464271a
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -229,6 -229,7 +229,7 @@@ from .infoq import InfoQI
  from .instagram import InstagramIE, InstagramUserIE
  from .internetvideoarchive import InternetVideoArchiveIE
  from .iprima import IPrimaIE
+ from .iqiyi import IqiyiIE
  from .ivi import (
      IviIE,
      IviCompilationIE
@@@ -352,10 -353,8 +353,10 @@@ from .ninegag import NineGagI
  from .noco import NocoIE
  from .normalboots import NormalbootsIE
  from .nosvideo import NosVideoIE
 +from .nova import NovaIE
  from .novamov import NovaMovIE
  from .nowness import NownessIE
 +from .nowtv import NowTVIE
  from .nowvideo import NowVideoIE
  from .npo import (
      NPOIE,
@@@ -402,7 -401,6 +403,7 @@@ from .playfm import PlayFMI
  from .playvid import PlayvidIE
  from .playwire import PlaywireIE
  from .podomatic import PodomaticIE
 +from .porn91 import Porn91IE
  from .pornhd import PornHdIE
  from .pornhub import (
      PornHubIE,
@@@ -440,6 -438,7 +441,6 @@@ from .roxwel import RoxwelI
  from .rtbf import RTBFIE
  from .rte import RteIE
  from .rtlnl import RtlNlIE
 -from .rtlnow import RTLnowIE
  from .rtl2 import RTL2IE
  from .rtp import RTPIE
  from .rts import RTSIE
@@@ -482,10 -481,6 +483,10 @@@ from .smotri import 
  )
  from .snotr import SnotrIE
  from .sohu import SohuIE
 +from .soompi import (
 +    SoompiIE,
 +    SoompiShowIE,
 +)
  from .soundcloud import (
      SoundcloudIE,
      SoundcloudSetIE,
@@@ -571,7 -566,6 +572,7 @@@ from .traileraddict import TrailerAddic
  from .trilulilu import TriluliluIE
  from .trutube import TruTubeIE
  from .tube8 import Tube8IE
 +from .tubitv import TubiTvIE
  from .tudou import TudouIE
  from .tumblr import TumblrIE
  from .tunein import TuneInIE