about summary refs log tree commit diff
path: root/youtube_dl/extractor/audimedia.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-12-29 00:58:24 +0600
committerSergey M․ <dstftw@gmail.com>2015-12-29 00:58:24 +0600
commit7e5edcfd333f05c610bd70c33f3d3fd0ff6a7cec (patch)
treecdb7507ea699e228587c945d24c38b716d696216 /youtube_dl/extractor/audimedia.py
parent39d60b715a75e92d169167876bb07424301c0b67 (diff)
downloadyoutube-dl-7e5edcfd333f05c610bd70c33f3d3fd0ff6a7cec.tar.gz
youtube-dl-7e5edcfd333f05c610bd70c33f3d3fd0ff6a7cec.tar.xz
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/audimedia.py')
-rw-r--r--youtube_dl/extractor/audimedia.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/youtube_dl/extractor/audimedia.py b/youtube_dl/extractor/audimedia.py
index 4382a302b..9b037bb0c 100644
--- a/youtube_dl/extractor/audimedia.py
+++ b/youtube_dl/extractor/audimedia.py
@@ -45,15 +45,11 @@ class AudiMediaIE(InfoExtractor):
 
             stream_url_hls = json_data.get('stream_url_hls')
             if stream_url_hls:
-                m3u8_formats = self._extract_m3u8_formats(stream_url_hls, video_id, 'mp4', entry_protocol='m3u8_native', m3u8_id='hls', fatal=False)
-                if m3u8_formats:
-                    formats.extend(m3u8_formats)
+                formats.extend(self._extract_m3u8_formats(stream_url_hls, video_id, 'mp4', entry_protocol='m3u8_native', m3u8_id='hls', fatal=False))
 
             stream_url_hds = json_data.get('stream_url_hds')
             if stream_url_hds:
-                f4m_formats = self._extract_f4m_formats(json_data.get('stream_url_hds') + '?hdcore=3.4.0', video_id, -1, f4m_id='hds', fatal=False)
-                if f4m_formats:
-                    formats.extend(f4m_formats)
+                formats.extend(self._extract_f4m_formats(json_data.get('stream_url_hds') + '?hdcore=3.4.0', video_id, -1, f4m_id='hds', fatal=False))
 
             for video_version in json_data.get('video_versions'):
                 video_version_url = video_version.get('download_url') or video_version.get('stream_url')