aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2015-12-28 18:17:12 +0100
committerremitamine <remitamine@gmail.com>2015-12-28 18:17:12 +0100
commit54537cdfb3da7a64967f07df86042ffca761d937 (patch)
tree894adf541b1d8e0a6f9577976cad87b22893726c /youtube_dl/extractor
parentbc737bd61aead4660024747d0d73018c6250874f (diff)
parent8d29e47f543152bf91db0167a313e56ea2f132e3 (diff)
downloadyoutube-dl-54537cdfb3da7a64967f07df86042ffca761d937.tar.xz
Merge pull request #8023 from remitamine/extract-formats
[common] simplify the use of _extract_m3u8_formats and _extract_f4m_formats
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/common.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 828f58f12..3d39781a4 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -885,7 +885,7 @@ class InfoExtractor(object):
fatal=fatal)
if manifest is False:
- return manifest
+ return []
formats = []
manifest_version = '1.0'
@@ -956,7 +956,7 @@ class InfoExtractor(object):
errnote=errnote or 'Failed to download m3u8 information',
fatal=fatal)
if res is False:
- return res
+ return []
m3u8_doc, urlh = res
m3u8_url = urlh.geturl()
last_info = None