From: remitamine <remitamine@gmail.com>
Date: Thu, 3 Dec 2015 19:28:52 +0000 (+0100)
Subject: Merge pull request #7659 from remitamine/audimedia
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=24dc1ed715239f85eb3d5f71a707da1dd2bc7773;hp=-c;p=youtube-dl

Merge pull request #7659 from remitamine/audimedia

[audimedia] Add new extractor(closes #7654)
---

24dc1ed715239f85eb3d5f71a707da1dd2bc7773
diff --combined youtube_dl/extractor/__init__.py
index d981acb8e,f17c22691..62f32f8c8
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -38,6 -38,7 +38,7 @@@ from .arte import 
  )
  from .atresplayer import AtresPlayerIE
  from .atttechchannel import ATTTechChannelIE
+ from .audimedia import AudiMediaIE
  from .audiomack import AudiomackIE, AudiomackAlbumIE
  from .azubu import AzubuIE
  from .baidu import BaiduVideoIE
@@@ -554,10 -555,6 +555,10 @@@ from .shahid import ShahidI
  from .shared import SharedIE
  from .sharesix import ShareSixIE
  from .sina import SinaIE
 +from .skynewsarabia import (
 +    SkyNewsArabiaIE,
 +    SkyNewsArabiaArticleIE,
 +)
  from .slideshare import SlideshareIE
  from .slutload import SlutloadIE
  from .smotri import (