projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
92a5c41
)
[extractor/common] Respect source's type attribute for HTML5 media (closes #13892)
author
Sergey M․
<dstftw@gmail.com>
Sat, 12 Aug 2017 09:48:11 +0000
(16:48 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 12 Aug 2017 09:48:11 +0000
(16:48 +0700)
youtube_dl/extractor/common.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index 459e7ffd6ced1685e802a642b5bc63b0c61e666c..4d61275fd2726e4bd96493de1006ab0375f87cdf 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-2114,9
+2114,9
@@
class InfoExtractor(object):
return f
return {}
return f
return {}
- def _media_formats(src, cur_media_type):
+ def _media_formats(src,
type_info,
cur_media_type):
full_url = absolute_url(src)
full_url = absolute_url(src)
- ext = determine_ext(full_url)
+ ext =
type_info.get('ext') or
determine_ext(full_url)
if ext == 'm3u8':
is_plain_url = False
formats = self._extract_m3u8_formats(
if ext == 'm3u8':
is_plain_url = False
formats = self._extract_m3u8_formats(
@@
-2165,9
+2165,9
@@
class InfoExtractor(object):
src = source_attributes.get('src')
if not src:
continue
src = source_attributes.get('src')
if not src:
continue
- is_plain_url, formats = _media_formats(src, media_type)
+ f = parse_content_type(source_attributes.get('type'))
+ is_plain_url, formats = _media_formats(src, f, media_type)
if is_plain_url:
if is_plain_url:
- f = parse_content_type(source_attributes.get('type'))
f.update(formats[0])
media_info['formats'].append(f)
else:
f.update(formats[0])
media_info['formats'].append(f)
else: