logo

youtube-dl

[mirror] Download/Watch videos from video hosters
commit: 54537cdfb3da7a64967f07df86042ffca761d937
parent bc737bd61aead4660024747d0d73018c6250874f
Author: remitamine <remitamine@gmail.com>
Date:   Mon, 28 Dec 2015 18:17:12 +0100

Merge pull request #8023 from remitamine/extract-formats

[common] simplify the use of _extract_m3u8_formats and _extract_f4m_formats

Diffstat:

Myoutube_dl/extractor/common.py4++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 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