From: Sergey M․ Date: Tue, 16 May 2017 15:11:34 +0000 (+0700) Subject: [extractor/common] Add support for schemeless URLs in _extract_wowza_formats (closes... X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=6f766798049418c15e3c1b62c046e507093993dd [extractor/common] Add support for schemeless URLs in _extract_wowza_formats (closes #13088, closes #13092) --- diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 0bbb1103b..74b6f1197 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -2205,8 +2205,9 @@ class InfoExtractor(object): def _extract_wowza_formats(self, url, video_id, m3u8_entry_protocol='m3u8_native', skip_protocols=[]): url = re.sub(r'/(?:manifest|playlist|jwplayer)\.(?:m3u8|f4m|mpd|smil)', '', url) - url_base = self._search_regex(r'(?:https?|rtmp|rtsp)(://[^?]+)', url, 'format url') - http_base_url = 'http' + url_base + url_base = self._search_regex( + r'(?:(?:https?|rtmp|rtsp):)?(//[^?]+)', url, 'format url') + http_base_url = self._proto_relative_url(url_base, scheme='http:') formats = [] if 'm3u8' not in skip_protocols: formats.extend(self._extract_m3u8_formats(