ansol/youtube-dl
7
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-24 22:05:45 +00:00
Code Issues Projects Releases Wiki Activity

[common] Add 'fatal' to _extract_m3u8_formats

Browse Source
This commit is contained in:
Yen Chi Hsuan 2015-07-06 08:39:38 +08:00
parent 0c20ee7d4b
commit 13af92fdc4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/extractor/common.py
View File

@ -846,7 +846,8 @@ class InfoExtractor(object):
def _extract_m3u8_formats(self, m3u8_url, video_id, ext=None, def _extract_m3u8_formats(self, m3u8_url, video_id, ext=None,
entry_protocol='m3u8', preference=None, entry_protocol='m3u8', preference=None,
m3u8_id=None, note=None, errnote=None): m3u8_id=None, note=None, errnote=None,
fatal=True):
formats = [{ formats = [{
'format_id': '-'.join(filter(None, [m3u8_id, 'meta'])), 'format_id': '-'.join(filter(None, [m3u8_id, 'meta'])),
@ -866,7 +867,10 @@ class InfoExtractor(object):
m3u8_doc = self._download_webpage( m3u8_doc = self._download_webpage(
m3u8_url, video_id, m3u8_url, video_id,
note=note or 'Downloading m3u8 information', note=note or 'Downloading m3u8 information',
errnote=errnote or 'Failed to download m3u8 information') errnote=errnote or 'Failed to download m3u8 information',
fatal=fatal)
if m3u8_doc is False:
return m3u8_doc
last_info = None last_info = None
last_media = None last_media = None
kv_rex = re.compile( kv_rex = re.compile(