diff options
| author | Random User <rndusr@posteo.de> | 2017-03-25 21:36:59 +0100 |
|---|---|---|
| committer | Random User <rndusr@posteo.de> | 2017-03-25 21:36:59 +0100 |
| commit | 4f06c1c9fcbfbc74b81b5fa89a616914b5ce5aad (patch) | |
| tree | a51b702e001d350b908780a119f76d8ea706d511 /youtube_dl/extractor/vk.py | |
| parent | c73e330e7adc9c0c15ac51aeea8fbb7dad95351a (diff) | |
| parent | 942b44a0525f677924c660bcb00902d705d91fc2 (diff) | |
Merge branch 'master' of github.com-rndusr:rg3/youtube-dl into fix/str-item-assignment
Diffstat (limited to 'youtube_dl/extractor/vk.py')
| -rw-r--r-- | youtube_dl/extractor/vk.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/youtube_dl/extractor/vk.py b/youtube_dl/extractor/vk.py index 7c42a4f54..dc2719cf9 100644 --- a/youtube_dl/extractor/vk.py +++ b/youtube_dl/extractor/vk.py @@ -432,8 +432,7 @@ class VKIE(VKBaseIE): }) elif format_id == 'hls': formats.extend(self._extract_m3u8_formats( - format_url, video_id, 'mp4', - entry_protocol='m3u8' if is_live else 'm3u8_native', + format_url, video_id, 'mp4', 'm3u8_native', m3u8_id=format_id, fatal=False, live=is_live)) elif format_id == 'rtmp': formats.append({ |