From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 20 Dec 2013 16:12:38 +0000 (-0800)
Subject: Merge pull request #2005 from dstftw/ivi.ru
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=3fefbf50e39e02c20e5cf1b1992561dc38f7c320;hp=-c;p=youtube-dl

Merge pull request #2005 from dstftw/ivi.ru

Add support for ivi.ru
---

3fefbf50e39e02c20e5cf1b1992561dc38f7c320
diff --combined youtube_dl/extractor/__init__.py
index 7de9d594a,677a894b3..2aa11fc80
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -1,7 -1,6 +1,7 @@@
  from .academicearth import AcademicEarthCourseIE
  from .addanime import AddAnimeIE
  from .anitube import AnitubeIE
 +from .aparat import AparatIE
  from .appletrailers import AppleTrailersIE
  from .archiveorg import ArchiveOrgIE
  from .ard import ARDIE
@@@ -83,6 -82,10 +83,10 @@@ from .ina import InaI
  from .infoq import InfoQIE
  from .instagram import InstagramIE
  from .internetvideoarchive import InternetVideoArchiveIE
+ from .ivi import (
+     IviIE,
+     IviCompilationIE
+ )
  from .jeuxvideo import JeuxVideoIE
  from .jukebox import JukeboxIE
  from .justintv import JustinTVIE