diff options
| author | Yen Chi Hsuan <yan12125@gmail.com> | 2016-08-22 02:18:46 +0800 | 
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2016-08-22 02:26:07 +0800 | 
| commit | ad120ae1c57fe3ff0c7f5559d280cb8230a2b38c (patch) | |
| tree | 32f7f7cf02a4527c54756d937ceda99ade3d9038 /youtube_dl/extractor/common.py | |
| parent | d0fa172e5fc1d676834252dcd395ec495b20b0bc (diff) | |
[extractor/common] Change the default m3u8 protocol in HTML5
Helper functions should have consistent default values
Diffstat (limited to 'youtube_dl/extractor/common.py')
| -rw-r--r-- | youtube_dl/extractor/common.py | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 07d58afe7..ba4c03d3d 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -1695,7 +1695,7 @@ class InfoExtractor(object):                          self.report_warning('Unknown MIME type %s in DASH manifest' % mime_type)          return formats -    def _parse_html5_media_entries(self, base_url, webpage, video_id, m3u8_id=None): +    def _parse_html5_media_entries(self, base_url, webpage, video_id, m3u8_id=None, m3u8_entry_protocol='m3u8'):          def absolute_url(video_url):              return compat_urlparse.urljoin(base_url, video_url) @@ -1715,8 +1715,8 @@ class InfoExtractor(object):              if determine_ext(full_url) == 'm3u8':                  is_plain_url = False                  formats = self._extract_m3u8_formats( -                    full_url, video_id, ext='mp4', entry_protocol='m3u8_native', -                    m3u8_id=m3u8_id) +                    full_url, video_id, ext='mp4', +                    entry_protocol=m3u8_entry_protocol, m3u8_id=m3u8_id)              else:                  is_plain_url = True                  formats = [{  | 
