|
|
@ -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,
|
|
|
|
})
|
|
|
|
})
|
|
|
|