projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[atresplayer] Update test
[youtube-dl]
/
youtube_dl
/
extractor
/
anvato.py
diff --git
a/youtube_dl/extractor/anvato.py
b/youtube_dl/extractor/anvato.py
index 46ca1899ecc42173394eead34190b55539c96ad9..9fd91c2f6e042f0368448dc8ab1fa28e6e207c48 100644
(file)
--- a/
youtube_dl/extractor/anvato.py
+++ b/
youtube_dl/extractor/anvato.py
@@
-163,9
+163,10
@@
class AnvatoIE(InfoExtractor):
formats = []
for published_url in video_data['published_urls']:
video_url = published_url['embed_url']
formats = []
for published_url in video_data['published_urls']:
video_url = published_url['embed_url']
+ media_format = published_url.get('format')
ext = determine_ext(video_url)
ext = determine_ext(video_url)
- if ext == 'smil':
+ if ext == 'smil'
or media_format == 'smil'
:
formats.extend(self._extract_smil_formats(video_url, video_id))
continue
formats.extend(self._extract_smil_formats(video_url, video_id))
continue
@@
-176,18
+177,13
@@
class AnvatoIE(InfoExtractor):
'tbr': tbr if tbr != 0 else None,
}
'tbr': tbr if tbr != 0 else None,
}
- if ext == 'm3u8':
- # Not using _extract_m3u8_formats here as individual media
- # playlists are also included in published_urls.
- if tbr is None:
- formats.append(self._m3u8_meta_format(video_url, ext='mp4', m3u8_id='hls'))
- continue
- else:
+ if ext == 'm3u8' or media_format in ('m3u8', 'm3u8-variant'):
+ if tbr is not None:
a_format.update({
'format_id': '-'.join(filter(None, ['hls', compat_str(tbr)])),
'ext': 'mp4',
})
a_format.update({
'format_id': '-'.join(filter(None, ['hls', compat_str(tbr)])),
'ext': 'mp4',
})
- elif ext == 'mp3':
+ elif ext == 'mp3'
or media_format == 'mp3'
:
a_format['vcodec'] = 'none'
else:
a_format.update({
a_format['vcodec'] = 'none'
else:
a_format.update({