aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/generic.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2017-07-28 12:13:19 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2017-07-28 12:13:19 +0200
commit24e966e8dab954136dabbc497064ac63b252495b (patch)
treef700f40aae611c0838d4f037ecfdbfbad47b552c /youtube_dl/extractor/generic.py
parent9682666bdadec955fb8600fa3721f59b2a4b8099 (diff)
downloadyoutube-dl-24e966e8dab954136dabbc497064ac63b252495b.tar.xz
[megaphone] Add extractor
Diffstat (limited to 'youtube_dl/extractor/generic.py')
-rw-r--r--youtube_dl/extractor/generic.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 36c81eda9..9678c32c4 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -97,6 +97,7 @@ from .washingtonpost import WashingtonPostIE
from .wistia import WistiaIE
from .mediaset import MediasetIE
from .joj import JojIE
+from .megaphone import MegaphoneIE
class GenericIE(InfoExtractor):
@@ -2790,6 +2791,13 @@ class GenericIE(InfoExtractor):
return self.playlist_from_matches(
joj_urls, video_id, video_title, ie=JojIE.ie_key())
+ # Look for megaphone.fm embeds
+ mpfn_urls = MegaphoneIE._extract_urls(webpage)
+ if mpfn_urls:
+ return self.playlist_from_matches(
+ mpfn_urls, video_id, video_title, ie=MegaphoneIE.ie_key())
+
+
def merge_dicts(dict1, dict2):
merged = {}
for k, v in dict1.items():