midgard/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[extractor/common] Fix rtmp and rtsp formats' URLs in _extract_wowza_formats

Browse source
This commit is contained in:
Sergey M․ 2017-05-17 22:19:33 +07:00
parent 6f76679804
commit f2e2f0c777
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
youtube_dl/extractor/common.py
View file

@ -2207,7 +2207,7 @@ class InfoExtractor(object):
url = re.sub(r'/(?:manifest|playlist|jwplayer)\.(?:m3u8|f4m|mpd|smil)', '', url) url = re.sub(r'/(?:manifest|playlist|jwplayer)\.(?:m3u8|f4m|mpd|smil)', '', url)
url_base = self._search_regex( url_base = self._search_regex(
r'(?:(?:https?|rtmp|rtsp):)?(//[^?]+)', url, 'format url') r'(?:(?:https?|rtmp|rtsp):)?(//[^?]+)', url, 'format url')
http_base_url = self._proto_relative_url(url_base, scheme='http:') http_base_url = '%s:%s' % ('http', url_base)
formats = [] formats = []
if 'm3u8' not in skip_protocols: if 'm3u8' not in skip_protocols:
formats.extend(self._extract_m3u8_formats( formats.extend(self._extract_m3u8_formats(
@ -2241,7 +2241,7 @@ class InfoExtractor(object):
for protocol in ('rtmp', 'rtsp'): for protocol in ('rtmp', 'rtsp'):
if protocol not in skip_protocols: if protocol not in skip_protocols:
formats.append({ formats.append({
'url': protocol + url_base, 'url': '%s:%s' % (protocol, url_base),
'format_id': protocol, 'format_id': protocol,
'protocol': protocol, 'protocol': protocol,
}) })