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/amp.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/amp.py')
| -rw-r--r-- | youtube_dl/extractor/amp.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/youtube_dl/extractor/amp.py b/youtube_dl/extractor/amp.py index dcc3c97f1..1035d1c48 100644 --- a/youtube_dl/extractor/amp.py +++ b/youtube_dl/extractor/amp.py @@ -53,16 +53,12 @@ class AMPIE(InfoExtractor): media = media_data['@attributes'] media_type = media['type'] if media_type == 'video/f4m': - f4m_formats = self._extract_f4m_formats( + formats.extend(self._extract_f4m_formats( media['url'] + '?hdcore=3.4.0&plugin=aasp-3.4.0.132.124', - video_id, f4m_id='hds', fatal=False) - if f4m_formats: - formats.extend(f4m_formats) + video_id, f4m_id='hds', fatal=False)) elif media_type == 'application/x-mpegURL': - m3u8_formats = self._extract_m3u8_formats( - media['url'], video_id, 'mp4', m3u8_id='hls', fatal=False) - if m3u8_formats: - formats.extend(m3u8_formats) + formats.extend(self._extract_m3u8_formats( + media['url'], video_id, 'mp4', m3u8_id='hls', fatal=False)) else: formats.append({ 'format_id': media_data['media-category']['@attributes']['label'], |