From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Tue, 19 Nov 2013 19:20:57 +0000 (+0100)
Subject: Merge pull request #1758 from migbac/master
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=495da337ae804fe013738f9d4f23002ead1276c7;hp=-c;p=youtube-dl

Merge pull request #1758 from migbac/master

Add support for d8.tv
---

495da337ae804fe013738f9d4f23002ead1276c7
diff --combined youtube_dl/extractor/__init__.py
index 2d1e3cdfd,d7db840dd..2679d1a8f
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -25,6 -25,7 +25,7 @@@ from .comedycentral import ComedyCentra
  from .condenast import CondeNastIE
  from .criterion import CriterionIE
  from .cspan import CSpanIE
+ from .d8 import D8IE
  from .dailymotion import (
      DailymotionIE,
      DailymotionPlaylistIE,
@@@ -57,7 -58,6 +58,7 @@@ from .francetv import 
  )
  from .freesound import FreesoundIE
  from .funnyordie import FunnyOrDieIE
 +from .gamekings import GamekingsIE
  from .gamespot import GameSpotIE
  from .gametrailers import GametrailersIE
  from .generic import GenericIE
@@@ -80,7 -80,7 +81,7 @@@ from .keezmovies import KeezMoviesI
  from .kickstarter import KickStarterIE
  from .keek import KeekIE
  from .liveleak import LiveLeakIE
 -from .livestream import LivestreamIE
 +from .livestream import LivestreamIE, LivestreamOriginalIE
  from .metacafe import MetacafeIE
  from .metacritic import MetacriticIE
  from .mit import TechTVMITIE, MITIE
@@@ -116,10 -116,7 +117,10 @@@ from .slashdot import SlashdotI
  from .slideshare import SlideshareIE
  from .sohu import SohuIE
  from .soundcloud import SoundcloudIE, SoundcloudSetIE, SoundcloudUserIE
 -from .southparkstudios import SouthParkStudiosIE
 +from .southparkstudios import (
 +    SouthParkStudiosIE,
 +    SouthparkDeIE,
 +)
  from .space import SpaceIE
  from .spankwire import SpankwireIE
  from .spiegel import SpiegelIE
@@@ -138,7 -135,6 +139,7 @@@ from .tube8 import Tube8I
  from .tudou import TudouIE
  from .tumblr import TumblrIE
  from .tutv import TutvIE
 +from .tvp import TvpIE
  from .unistra import UnistraIE
  from .ustream import UstreamIE, UstreamChannelIE
  from .vbox7 import Vbox7IE