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/ard.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/ard.py')
| -rw-r--r-- | youtube_dl/extractor/ard.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/youtube_dl/extractor/ard.py b/youtube_dl/extractor/ard.py index 687eb9f82..9fb84911a 100644 --- a/youtube_dl/extractor/ard.py +++ b/youtube_dl/extractor/ard.py @@ -113,16 +113,12 @@ class ARDMediathekIE(InfoExtractor): if quality != 'auto' and ext in ('f4m', 'm3u8'): continue if ext == 'f4m': - f4m_formats = self._extract_f4m_formats( + formats.extend(self._extract_f4m_formats( stream_url + '?hdcore=3.1.1&plugin=aasp-3.1.1.69.124', - video_id, preference=-1, f4m_id='hds', fatal=False) - if f4m_formats: - formats.extend(f4m_formats) + video_id, preference=-1, f4m_id='hds', fatal=False)) elif ext == 'm3u8': - m3u8_formats = self._extract_m3u8_formats( - stream_url, video_id, 'mp4', preference=1, m3u8_id='hls', fatal=False) - if m3u8_formats: - formats.extend(m3u8_formats) + formats.extend(self._extract_m3u8_formats( + stream_url, video_id, 'mp4', preference=1, m3u8_id='hls', fatal=False)) else: if server and server.startswith('rtmp'): f = { |