From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 25 Jun 2013 15:12:35 +0000 (+0200)
Subject: Add Jukebox IE
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=515d7a5e73082c0f2e35bf7e778573bb2bbd576e;hp=-c

Add Jukebox IE
---

515d7a5e73082c0f2e35bf7e778573bb2bbd576e
diff --combined youtube_dl/extractor/__init__.py
index 9878ad942,e27f58496..7b291f907
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -22,6 -22,7 +22,7 @@@ from .hypem import HypemI
  from .ina import InaIE
  from .infoq import InfoQIE
  from .justintv import JustinTVIE
+ from .jukebox import JukeboxIE
  from .keek import KeekIE
  from .liveleak import LiveLeakIE
  from .metacafe import MetacafeIE
@@@ -44,7 -45,6 +45,7 @@@ from .ted import TEDI
  from .tumblr import TumblrIE
  from .ustream import UstreamIE
  from .vbox7 import Vbox7IE
 +from .vevo import VevoIE
  from .vimeo import VimeoIE
  from .vine import VineIE
  from .worldstarhiphop import WorldStarHipHopIE
@@@ -126,7 -126,7 +127,8 @@@ def gen_extractors()
          GametrailersIE(),
          StatigramIE(),
          BreakIE(),
 +        VevoIE(),
+         JukeboxIE(),
          GenericIE()
      ]