aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2015-06-07 16:33:22 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2015-06-07 16:33:22 +0800
commit621ed9f5f4d9d82659272ebe01e740e9196fad61 (patch)
treed64a70bd19a74e292416f1c749cf3b3620935e8a /youtube_dl
parentb26733ba7f376f8c9285ac7928534286622bbc7c (diff)
downloadyoutube-dl-621ed9f5f4d9d82659272ebe01e740e9196fad61.tar.xz
[common] Add note and errnote field for _extract_m3u8_formats
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/common.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index cecf917ff..49e4dc710 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -846,7 +846,7 @@ class InfoExtractor(object):
def _extract_m3u8_formats(self, m3u8_url, video_id, ext=None,
entry_protocol='m3u8', preference=None,
- m3u8_id=None):
+ m3u8_id=None, note=None, errnote=None):
formats = [{
'format_id': '-'.join(filter(None, [m3u8_id, 'meta'])),
@@ -865,8 +865,8 @@ class InfoExtractor(object):
m3u8_doc = self._download_webpage(
m3u8_url, video_id,
- note='Downloading m3u8 information',
- errnote='Failed to download m3u8 information')
+ note=note or 'Downloading m3u8 information',
+ errnote=errnote or 'Failed to download m3u8 information')
last_info = None
last_media = None
kv_rex = re.compile(