projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6f76679
)
[extractor/common] Fix rtmp and rtsp formats' URLs in _extract_wowza_formats
author
Sergey M․
<dstftw@gmail.com>
Wed, 17 May 2017 15:19:33 +0000
(22:19 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Wed, 17 May 2017 15:20:25 +0000
(22:20 +0700)
youtube_dl/extractor/common.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index 74b6f1197bc77f3ad4c87b25127ce914b2359da8..fec39da8b6ec498b7a50674f692180570f8c0dac 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-2207,7
+2207,7
@@
class InfoExtractor(object):
url = re.sub(r'/(?:manifest|playlist|jwplayer)\.(?:m3u8|f4m|mpd|smil)', '', url)
url_base = self._search_regex(
r'(?:(?:https?|rtmp|rtsp):)?(//[^?]+)', url, 'format url')
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 =
self._proto_relative_url(url_base, scheme='http:'
)
+ http_base_url =
'%s:%s' % ('http', url_base
)
formats = []
if 'm3u8' not in skip_protocols:
formats.extend(self._extract_m3u8_formats(
formats = []
if 'm3u8' not in skip_protocols:
formats.extend(self._extract_m3u8_formats(
@@
-2241,7
+2241,7
@@
class InfoExtractor(object):
for protocol in ('rtmp', 'rtsp'):
if protocol not in skip_protocols:
formats.append({
for protocol in ('rtmp', 'rtsp'):
if protocol not in skip_protocols:
formats.append({
- 'url':
protocol + url_base
,
+ 'url':
'%s:%s' % (protocol, url_base)
,
'format_id': protocol,
'protocol': protocol,
})
'format_id': protocol,
'protocol': protocol,
})