Backups/youtube-dl
1
0
Fork 0
mirror of https://gitlab.com/ytdl-org/youtube-dl.git synced 2025-11-04 04:37:06 -05:00
Code Issues Releases Wiki Activity

Simplify formats accumulation for f4m/m3u8/smil formats

Browse Source 
Now all _extract_*_formats routines return a list
This commit is contained in:
Sergey M․
2015-12-29 00:58:24 +06:00
parent 39d60b715a
commit 7e5edcfd33
32 changed files with 99 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/extractor/ign.py
View File

@@ -129,14 +129,10 @@ class IGNIE(InfoExtractor):
formats = []
m3u8_url = api_data['refs'].get('m3uUrl')
if m3u8_url:
m3u8_formats = self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False)
if m3u8_formats:
formats.extend(m3u8_formats)
formats.extend(self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False))
f4m_url = api_data['refs'].get('f4mUrl')
if f4m_url:
f4m_formats = self._extract_f4m_formats(f4m_url, video_id, f4m_id='hds', fatal=False)
if f4m_formats:
formats.extend(f4m_formats)
formats.extend(self._extract_f4m_formats(f4m_url, video_id, f4m_id='hds', fatal=False))
for asset in api_data['assets']:
formats.append({
'url': asset['url'],