paradizelost/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[extractor/common] Respect source's type attribute for HTML5 media (closes #13892)

Browse Source
This commit is contained in:
Sergey M․ 2017-08-12 16:48:11 +07:00
parent 92a5c41532
commit 82889d4ae5
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/extractor/common.py
View File

@ -2114,9 +2114,9 @@ class InfoExtractor(object):
return f return f
return {} 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': if ext == 'm3u8':
is_plain_url = False is_plain_url = False
formats = self._extract_m3u8_formats( formats = self._extract_m3u8_formats(
@ -2165,9 +2165,9 @@ class InfoExtractor(object):
src = source_attributes.get('src') src = source_attributes.get('src')
if not src: if not src:
continue 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]) f.update(formats[0])
media_info['formats'].append(f) media_info['formats'].append(f)
else: else: