Merge branch 'soompi' of https://github.com/ping/youtube-dl into ping-soompi

diff --combined youtube_dl/extractor/__init__.py
index 3c1e8d5269568b19a08f804247517dde55256e8c,2a5cf95470c99886eadbc5306fb31f516d7d8b80..f73bf646b510b8e9c93bbfc1fc5c5508da97f782
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -149,6 -149,7 +149,6 @@@ from .extremetube import ExtremeTubeI
  from .facebook import FacebookIE
  from .faz import FazIE
  from .fc2 import FC2IE
 -from .firedrive import FiredriveIE
  from .firstpost import FirstpostIE
  from .firsttv import FirstTVIE
  from .fivemin import FiveMinIE
@@@ -243,7 -244,6 +243,7 @@@ from .kaltura import KalturaI
  from .kanalplay import KanalPlayIE
  from .kankan import KankanIE
  from .karaoketv import KaraoketvIE
 +from .karrierevideos import KarriereVideosIE
  from .keezmovies import KeezMoviesIE
  from .khanacademy import KhanAcademyIE
  from .kickstarter import KickStarterIE
@@@ -338,7 -338,8 +338,7 @@@ from .newstube import NewstubeI
  from .nextmedia import (
      NextMediaIE,
      NextMediaActionNewsIE,
 -    AppleDailyRealtimeNewsIE,
 -    AppleDailyAnimationNewsIE
 +    AppleDailyIE,
  )
  from .nfb import NFBIE
  from .nfl import NFLIE
@@@ -354,7 -355,6 +354,7 @@@ from .normalboots import NormalbootsI
  from .nosvideo import NosVideoIE
  from .novamov import NovaMovIE
  from .nowness import NownessIE
 +from .nowtv import NowTVIE
  from .nowvideo import NowVideoIE
  from .npo import (
      NPOIE,
@@@ -438,6 -438,7 +438,6 @@@ from .roxwel import RoxwelI
  from .rtbf import RTBFIE
  from .rte import RteIE
  from .rtlnl import RtlNlIE
 -from .rtlnow import RTLnowIE
  from .rtl2 import RTL2IE
  from .rtp import RTPIE
  from .rts import RTSIE
@@@ -479,7 -480,12 +479,11 @@@ from .smotri import 
      SmotriBroadcastIE,
  )
  from .snotr import SnotrIE
 -from .sockshare import SockshareIE
  from .sohu import SohuIE
+ from .soompi import (
+     SoompiIE,
+     SoompiShowIE,
+ )
  from .soundcloud import (
      SoundcloudIE,
      SoundcloudSetIE,
@@@ -645,10 -651,7 +649,10 @@@ from .vine import 
      VineIE,
      VineUserIE,
  )
 -from .viki import VikiIE
 +from .viki import (
 +    VikiIE,
 +    VikiChannelIE,
 +)
  from .vk import (
      VKIE,
      VKUserVideosIE,