From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Wed, 7 Sep 2016 16:08:02 +0000 (+0800)
Subject: Merge branch 'miaopai' of https://github.com/xyb/youtube-dl into xyb-miaopai
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=2841bdcebb308cab2a6af6b970459889392faa40;hp=-c;p=youtube-dl

Merge branch 'miaopai' of https://github.com/xyb/youtube-dl into xyb-miaopai
---

2841bdcebb308cab2a6af6b970459889392faa40
diff --combined youtube_dl/extractor/extractors.py
index 9fe824c67,d511b04bc..522ef7d8b
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@@ -5,14 -5,11 +5,14 @@@ from .abc import 
      ABCIE,
      ABCIViewIE,
  )
 -from .abc7news import Abc7NewsIE
  from .abcnews import (
      AbcNewsIE,
      AbcNewsVideoIE,
  )
 +from .abcotvs import (
 +    ABCOTVSIE,
 +    ABCOTVSClipsIE,
 +)
  from .academicearth import AcademicEarthCourseIE
  from .acast import (
      ACastIE,
@@@ -146,7 -143,6 +146,7 @@@ from .cbsnews import 
  )
  from .cbssports import CBSSportsIE
  from .ccc import CCCIE
 +from .cctv import CCTVIE
  from .cda import CDAIE
  from .ceskatelevize import CeskaTelevizeIE
  from .channel9 import Channel9IE
@@@ -425,7 -421,6 +425,7 @@@ from .kuwo import 
  )
  from .la7 import LA7IE
  from .laola1tv import Laola1TvIE
 +from .lci import LCIIE
  from .lcp import (
      LcpPlayIE,
      LcpIE,
@@@ -476,6 -471,7 +476,7 @@@ from .metacafe import MetacafeI
  from .metacritic import MetacriticIE
  from .mgoon import MgoonIE
  from .mgtv import MGTVIE
+ from .miaopai import MiaoPaiIE
  from .microsoftvirtualacademy import (
      MicrosoftVirtualAcademyIE,
      MicrosoftVirtualAcademyCourseIE,
@@@ -892,7 -888,6 +893,7 @@@ from .toypics import ToypicsUserIE, Toy
  from .traileraddict import TrailerAddictIE
  from .trilulilu import TriluliluIE
  from .trollvids import TrollvidsIE
 +from .trutv import TruTVIE
  from .tube8 import Tube8IE
  from .tubitv import TubiTvIE
  from .tudou import (
@@@ -922,7 -917,6 +923,7 @@@ from .tvc import 
  )
  from .tvigle import TvigleIE
  from .tvland import TVLandIE
 +from .tvnoe import TVNoeIE
  from .tvp import (
      TVPEmbedIE,
      TVPIE,