nhyatt/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-07-01 11:32:49 -05:00
Code Issues Projects 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

12
youtube_dl/extractor/ruutu.py
View File

@ -63,15 +63,11 @@ class RuutuIE(InfoExtractor):
processed_urls.append(video_url)
ext = determine_ext(video_url)
if ext == 'm3u8':
m3u8_formats = self._extract_m3u8_formats(
video_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
if m3u8_formats:
formats.extend(m3u8_formats)
formats.extend(self._extract_m3u8_formats(
video_url, video_id, 'mp4', m3u8_id='hls', fatal=False))
elif ext == 'f4m':
f4m_formats = self._extract_f4m_formats(
video_url, video_id, f4m_id='hds', fatal=False)
if f4m_formats:
formats.extend(f4m_formats)
formats.extend(self._extract_f4m_formats(
video_url, video_id, f4m_id='hds', fatal=False))
else:
proto = compat_urllib_parse_urlparse(video_url).scheme
if not child.tag.startswith('HTTP') and proto != 'rtmp':