diff options
Diffstat (limited to 'youtube_dl/extractor/ultimedia.py')
| -rw-r--r-- | youtube_dl/extractor/ultimedia.py | 10 | 
1 files changed, 6 insertions, 4 deletions
| diff --git a/youtube_dl/extractor/ultimedia.py b/youtube_dl/extractor/ultimedia.py index 96c809eaf..c4751050e 100644 --- a/youtube_dl/extractor/ultimedia.py +++ b/youtube_dl/extractor/ultimedia.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals  import re  from .common import InfoExtractor +from ..compat import compat_urllib_parse_urlparse  from ..utils import (      ExtractorError,      qualities, @@ -44,9 +45,9 @@ class UltimediaIE(InfoExtractor):          video_id = self._match_id(url)          webpage = self._download_webpage(url, video_id) -        deliver_url = self._search_regex( -            r'<iframe[^>]+src="(https?://(?:www\.)?ultimedia\.com/deliver/[^"]+)"', -            webpage, 'deliver URL') +        deliver_url = self._proto_relative_url(self._search_regex( +            r'<iframe[^>]+src="((?:https?:)?//(?:www\.)?ultimedia\.com/deliver/[^"]+)"', +            webpage, 'deliver URL'), compat_urllib_parse_urlparse(url).scheme + ':')          deliver_page = self._download_webpage(              deliver_url, video_id, 'Downloading iframe page') @@ -57,7 +58,8 @@ class UltimediaIE(InfoExtractor):          player = self._parse_json(              self._search_regex( -                r"jwplayer\('player(?:_temp)?'\)\.setup\(({.+?})\)\.on", deliver_page, 'player'), +                r"jwplayer\('player(?:_temp)?'\)\.setup\(({.+?})\)\.on", +                deliver_page, 'player'),              video_id)          quality = qualities(['flash', 'html5']) | 
