aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/__init__.py
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2015-08-20 01:56:08 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2015-08-20 01:56:08 +0800
commit51047444aa6516b0062a3320625f67e3d4fe51d2 (patch)
tree473d4498ac115a3005e6f598bc8176accfed197b /youtube_dl/extractor/__init__.py
parent22c83245c51faa53118a8f815b13b2e4c2df9923 (diff)
parentaa6cd05ed82b14af0e3827b2ff43eed02087b574 (diff)
downloadyoutube-dl-51047444aa6516b0062a3320625f67e3d4fe51d2.tar.xz
Merge branch 'master' into HEAD
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
-rw-r--r--youtube_dl/extractor/__init__.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 006ef3922..1c53a5632 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -359,6 +359,7 @@ from .nbc import (
NBCNewsIE,
NBCSportsIE,
NBCSportsVPlayerIE,
+ MSNBCIE,
)
from .ndr import (
NDRIE,
@@ -613,7 +614,10 @@ from .testurl import TestURLIE
from .testtube import TestTubeIE
from .tf1 import TF1IE
from .theonion import TheOnionIE
-from .theplatform import ThePlatformIE
+from .theplatform import (
+ ThePlatformIE,
+ ThePlatformFeedIE,
+)
from .thesixtyone import TheSixtyOneIE
from .thisamericanlife import ThisAmericanLifeIE
from .thisav import ThisAVIE