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/toggle.py | |
| parent | 39d60b715a75e92d169167876bb07424301c0b67 (diff) | |
| download | youtube-dl-7e5edcfd333f05c610bd70c33f3d3fd0ff6a7cec.zip youtube-dl-7e5edcfd333f05c610bd70c33f3d3fd0ff6a7cec.tar.gz youtube-dl-7e5edcfd333f05c610bd70c33f3d3fd0ff6a7cec.tar.bz2 | |
Simplify formats accumulation for f4m/m3u8/smil formats
Now all _extract_*_formats routines return a list
Diffstat (limited to 'youtube_dl/extractor/toggle.py')
| -rw-r--r-- | youtube_dl/extractor/toggle.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/youtube_dl/extractor/toggle.py b/youtube_dl/extractor/toggle.py index a472399..c54b876 100644 --- a/youtube_dl/extractor/toggle.py +++ b/youtube_dl/extractor/toggle.py @@ -132,13 +132,11 @@ class ToggleIE(InfoExtractor): vid_format = vid_format.replace(' ', '') # if geo-restricted, m3u8 is inaccessible, but mp4 is okay if ext == 'm3u8': - m3u8_formats = self._extract_m3u8_formats( + formats.extend(self._extract_m3u8_formats( video_url, video_id, ext='mp4', m3u8_id=vid_format, note='Downloading %s m3u8 information' % vid_format, errnote='Failed to download %s m3u8 information' % vid_format, - fatal=False) - if m3u8_formats: - formats.extend(m3u8_formats) + fatal=False)) elif ext in ('mp4', 'wvm'): # wvm are drm-protected files formats.append({ |