aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/generic.py
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2015-12-29 17:29:55 +0100
committerremitamine <remitamine@gmail.com>2015-12-29 17:31:18 +0100
commit06e4874c997fb523bd9d8e675d1ec0e69ab501ed (patch)
treeaa158ea2a2fc727e6e3c5131a18b6b69f574f7e1 /youtube_dl/extractor/generic.py
parent0d8a0fdc30845aecfb9c98ccd4884dd1456dda86 (diff)
parent3da3999612311ff193890072727208892b9e93f0 (diff)
Merge branch 'jukebox' of https://github.com/remitamine/youtube-dl into remitamine-jukebox
Diffstat (limited to 'youtube_dl/extractor/generic.py')
-rw-r--r--youtube_dl/extractor/generic.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 3c3066e38..70a8d8eb9 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -56,6 +56,7 @@ from .mtv import MTVServicesEmbeddedIE
from .pladform import PladformIE
from .googledrive import GoogleDriveIE
from .jwplatform import JWPlatformIE
+from .ultimedia import UltimediaIE
class GenericIE(InfoExtractor):
@@ -1807,6 +1808,11 @@ class GenericIE(InfoExtractor):
if mobj is not None:
return self.url_result(unescapeHTML(mobj.group('url')), 'ScreenwaveMedia')
+ # Look for Ulltimedia embeds
+ ultimedia_url = UltimediaIE._extract_url(webpage)
+ if ultimedia_url:
+ return self.url_result(self._proto_relative_url(ultimedia_url), 'Ultimedia')
+
# Look for AdobeTVVideo embeds
mobj = re.search(
r'<iframe[^>]+src=[\'"]((?:https?:)?//video\.tv\.adobe\.com/v/\d+[^"]+)[\'"]',