diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-12-29 00:58:24 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-12-29 00:58:24 +0600 |
| commit | 7e5edcfd333f05c610bd70c33f3d3fd0ff6a7cec (patch) | |
| tree | cdb7507ea699e228587c945d24c38b716d696216 /youtube_dl/extractor/ooyala.py | |
| parent | 39d60b715a75e92d169167876bb07424301c0b67 (diff) | |
Simplify formats accumulation for f4m/m3u8/smil formats
Now all _extract_*_formats routines return a list
Diffstat (limited to 'youtube_dl/extractor/ooyala.py')
| -rw-r--r-- | youtube_dl/extractor/ooyala.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/youtube_dl/extractor/ooyala.py b/youtube_dl/extractor/ooyala.py index 8603fd692..3960d522e 100644 --- a/youtube_dl/extractor/ooyala.py +++ b/youtube_dl/extractor/ooyala.py @@ -44,17 +44,11 @@ class OoyalaBaseIE(InfoExtractor): urls.append(url) delivery_type = stream['delivery_type'] if delivery_type == 'hls' or '.m3u8' in url: - m3u8_formats = self._extract_m3u8_formats(url, embed_code, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False) - if m3u8_formats: - formats.extend(m3u8_formats) + formats.extend(self._extract_m3u8_formats(url, embed_code, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False)) elif delivery_type == 'hds' or '.f4m' in url: - f4m_formats = self._extract_f4m_formats(url, embed_code, f4m_id='hds', fatal=False) - if f4m_formats: - formats.extend(f4m_formats) + formats.extend(self._extract_f4m_formats(url, embed_code, f4m_id='hds', fatal=False)) elif '.smil' in url: - smil_formats = self._extract_smil_formats(url, embed_code, fatal=False) - if smil_formats: - formats.extend(smil_formats) + formats.extend(self._extract_smil_formats(url, embed_code, fatal=False)) else: formats.append({ 'url': url, |