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/vimeo.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/vimeo.py')
| -rw-r--r-- | youtube_dl/extractor/vimeo.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py index ce08e6955..7af699982 100644 --- a/youtube_dl/extractor/vimeo.py +++ b/youtube_dl/extractor/vimeo.py @@ -437,10 +437,8 @@ class VimeoIE(VimeoBaseInfoExtractor): }) m3u8_url = config_files.get('hls', {}).get('url') if m3u8_url: - m3u8_formats = self._extract_m3u8_formats( - m3u8_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False) - if m3u8_formats: - formats.extend(m3u8_formats) + formats.extend(self._extract_m3u8_formats( + m3u8_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False)) # Bitrates are completely broken. Single m3u8 may contain entries in kbps and bps # at the same time without actual units specified. This lead to wrong sorting. self._sort_formats(formats, field_preference=('preference', 'height', 'width', 'fps', 'format_id')) |