From d5037ae10797c4c11a81a7ffb3f2e2b84f190a40 Mon Sep 17 00:00:00 2001 From: Nehal Patel Date: Fri, 19 Aug 2016 16:08:20 -0500 Subject: [PATCH] [generic] Make generic extractor use hlsnative for m3u8 files --- youtube_dl/extractor/generic.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 4aa24061c..69e4d3332 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -1379,7 +1379,7 @@ class GenericIE(InfoExtractor): if m: format_id = m.group('format_id') if format_id.endswith('mpegurl'): - formats = self._extract_m3u8_formats(url, video_id, 'mp4') + formats = self._extract_m3u8_formats(url, video_id, 'mp4', entry_protocol='m3u8_native', m3u8_id='hls') elif format_id == 'f4m': formats = self._extract_f4m_formats(url, video_id) else: @@ -1415,7 +1415,7 @@ class GenericIE(InfoExtractor): # Is it an M3U playlist? if first_bytes.startswith(b'#EXTM3U'): - info_dict['formats'] = self._extract_m3u8_formats(url, video_id, 'mp4') + info_dict['formats'] = self._extract_m3u8_formats(url, video_id, 'mp4', entry_protocol='m3u8_native', m3u8_id='hls') self._sort_formats(info_dict['formats']) return info_dict @@ -2167,7 +2167,7 @@ class GenericIE(InfoExtractor): elif ext == 'xspf': return self.playlist_result(self._extract_xspf_playlist(video_url, video_id), video_id) elif ext == 'm3u8': - entry_info_dict['formats'] = self._extract_m3u8_formats(video_url, video_id, ext='mp4') + entry_info_dict['formats'] = self._extract_m3u8_formats(video_url, video_id, ext='mp4', entry_protocol='m3u8_native', m3u8_id='hls') elif ext == 'mpd': entry_info_dict['formats'] = self._extract_mpd_formats(video_url, video_id) elif ext == 'f4m':