aboutsummaryrefslogtreecommitdiffhomepage
path: root/youtube_dl/extractor/zdf.py
diff options
context:
space:
mode:
authorSergey M․ <[email protected]>2015-12-29 00:58:24 +0600
committerSergey M․ <[email protected]>2015-12-29 00:58:24 +0600
commit7e5edcfd333f05c610bd70c33f3d3fd0ff6a7cec (patch)
treecdb7507ea699e228587c945d24c38b716d696216 /youtube_dl/extractor/zdf.py
parent39d60b715a75e92d169167876bb07424301c0b67 (diff)
downloadyoutube-dl-7e5edcfd333f05c610bd70c33f3d3fd0ff6a7cec.tar.gz
youtube-dl-7e5edcfd333f05c610bd70c33f3d3fd0ff6a7cec.zip
Simplify formats accumulation for f4m/m3u8/smil formats
Now all _extract_*_formats routines return a list
Diffstat (limited to 'youtube_dl/extractor/zdf.py')
-rw-r--r--youtube_dl/extractor/zdf.py18
1 files changed, 6 insertions, 12 deletions
diff --git a/youtube_dl/extractor/zdf.py b/youtube_dl/extractor/zdf.py
index 92c12bac6..2a1f2f6d1 100644
--- a/youtube_dl/extractor/zdf.py
+++ b/youtube_dl/extractor/zdf.py
@@ -125,20 +125,14 @@ class ZDFIE(InfoExtractor):
if ext == 'meta':
continue
elif ext == 'smil':
- smil_formats = self._extract_smil_formats(
- video_url, video_id, fatal=False)
- if smil_formats:
- formats.extend(smil_formats)
+ formats.extend(self._extract_smil_formats(
+ video_url, video_id, fatal=False))
elif 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 = format_m.group('proto').lower()