Merge remote-tracking branch 'Huarong/master'

diff --combined youtube_dl/extractor/__init__.py
index 21e9e5d37234a9535555fcdc6e1df3a67e764073,3a08d676fb40db39f09f1c2eb09618b0516552f0..6b5037c8c18092c8fdafd3675b0baa9d1327cadd
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -1,5 -1,3 +1,5 @@@
 +from .appletrailers import AppleTrailersIE
 +from .addanime import AddAnimeIE
  from .archiveorg import ArchiveOrgIE
  from .ard import ARDIE
  from .arte import ArteTvIE
@@@ -8,10 -6,7 +8,10 @@@ from .bandcamp import BandcampI
  from .bliptv import BlipTVIE, BlipTVUserIE
  from .breakcom import BreakIE
  from .brightcove import BrightcoveIE
 +from .c56 import C56IE
  from .canalplus import CanalplusIE
 +from .canalc2 import Canalc2IE
 +from .cnn import CNNIE
  from .collegehumor import CollegeHumorIE
  from .comedycentral import ComedyCentralIE
  from .condenast import CondeNastIE
@@@ -34,7 -29,6 +34,7 @@@ from .gametrailers import GametrailersI
  from .generic import GenericIE
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
 +from .hark import HarkIE
  from .hotnewhiphop import HotNewHipHopIE
  from .howcast import HowcastIE
  from .hypem import HypemIE
@@@ -42,7 -36,6 +42,7 @@@ from .ign import IGNIE, OneUPI
  from .ina import InaIE
  from .infoq import InfoQIE
  from .instagram import InstagramIE
 +from .jeuxvideo import JeuxVideoIE
  from .jukebox import JukeboxIE
  from .justintv import JustinTVIE
  from .kankan import KankanIE
@@@ -50,26 -43,19 +50,27 @@@ from .keek import KeekI
  from .liveleak import LiveLeakIE
  from .livestream import LivestreamIE
  from .metacafe import MetacafeIE
 +from .mit import TechTVMITIE, MITIE
  from .mixcloud import MixcloudIE
  from .mtv import MTVIE
 +from .muzu import MuzuTVIE
  from .myspass import MySpassIE
  from .myvideo import MyVideoIE
  from .nba import NBAIE
 +from .nbc import NBCNewsIE
 +from .ooyala import OoyalaIE
 +from .pbs import PBSIE
  from .photobucket import PhotobucketIE
  from .pornotube import PornotubeIE
  from .rbmaradio import RBMARadioIE
  from .redtube import RedTubeIE
  from .ringtv import RingTVIE
 +from .ro220 import Ro220IE
  from .roxwel import RoxwelIE
 +from .rtlnow import RTLnowIE
  from .sina import SinaIE
 +from .slashdot import SlashdotIE
+ from .sohu import SohuIE
  from .soundcloud import SoundcloudIE, SoundcloudSetIE
  from .spiegel import SpiegelIE
  from .stanfordoc import StanfordOpenClassroomIE
@@@ -80,18 -66,16 +81,18 @@@ from .ted import TEDI
  from .tf1 import TF1IE
  from .thisav import ThisAVIE
  from .traileraddict import TrailerAddictIE
 +from .trilulilu import TriluliluIE
  from .tudou import TudouIE
  from .tumblr import TumblrIE
  from .tutv import TutvIE
 +from .unistra import UnistraIE
  from .ustream import UstreamIE
  from .vbox7 import Vbox7IE
  from .veoh import VeohIE
  from .vevo import VevoIE
 +from .videofyme import VideofyMeIE
  from .vimeo import VimeoIE, VimeoChannelIE
  from .vine import VineIE
 -from .c56 import C56IE
  from .wat import WatIE
  from .weibo import WeiboIE
  from .wimp import WimpIE
@@@ -125,14 -109,12 +126,14 @@@ _ALL_CLASSES = 
  ]
  _ALL_CLASSES.append(GenericIE)
  
 +
  def gen_extractors():
      """ Return a list of an instance of every supported extractor.
      The order does matter; the first extractor matched is the one handling the URL.
      """
      return [klass() for klass in _ALL_CLASSES]
  
 +
  def get_info_extractor(ie_name):
      """Returns the info extractor class with the given ie_name"""
      return globals()[ie_name+'IE']