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/atresplayer.py | |
| parent | 39d60b715a75e92d169167876bb07424301c0b67 (diff) | |
| download | youtube-dl-7e5edcfd333f05c610bd70c33f3d3fd0ff6a7cec.tar.xz | |
Simplify formats accumulation for f4m/m3u8/smil formats
Now all _extract_*_formats routines return a list
Diffstat (limited to 'youtube_dl/extractor/atresplayer.py')
| -rw-r--r-- | youtube_dl/extractor/atresplayer.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/youtube_dl/extractor/atresplayer.py b/youtube_dl/extractor/atresplayer.py index 7ac3044c7..3fb042cea 100644 --- a/youtube_dl/extractor/atresplayer.py +++ b/youtube_dl/extractor/atresplayer.py @@ -134,10 +134,8 @@ class AtresPlayerIE(InfoExtractor): m3u8_url = player.get('urlVideoHls') if m3u8_url: - m3u8_formats = self._extract_m3u8_formats( - m3u8_url, episode_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False) - if m3u8_formats: - formats.extend(m3u8_formats) + formats.extend(self._extract_m3u8_formats( + m3u8_url, episode_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False)) timestamp = int_or_none(self._download_webpage( self._TIME_API_URL, @@ -170,9 +168,7 @@ class AtresPlayerIE(InfoExtractor): continue else: f4m_url = video_url[:-9] + '/manifest.f4m' - 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)) self._sort_formats(formats) path_data = player.get('pathData') |