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/funimation.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/funimation.py')
| -rw-r--r-- | youtube_dl/extractor/funimation.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/youtube_dl/extractor/funimation.py b/youtube_dl/extractor/funimation.py index d1a95d87f..0f37ed786 100644 --- a/youtube_dl/extractor/funimation.py +++ b/youtube_dl/extractor/funimation.py @@ -151,11 +151,9 @@ class FunimationIE(InfoExtractor): errors.append(format_url) continue if determine_ext(format_url) == 'm3u8': - m3u8_formats = self._extract_m3u8_formats( + formats.extend(self._extract_m3u8_formats( format_url + auth_token, display_id, 'mp4', entry_protocol='m3u8_native', - preference=preference, m3u8_id='%s-hls' % funimation_id, fatal=False) - if m3u8_formats: - formats.extend(m3u8_formats) + preference=preference, m3u8_id='%s-hls' % funimation_id, fatal=False)) else: tbr = int_or_none(self._search_regex( r'-(\d+)[Kk]', format_url, 'tbr', default=None)) |