Merge pull request #8023 from remitamine/extract-formats

[common] simplify the use of _extract_m3u8_formats and _extract_f4m_formats
This commit is contained in:
remitamine 2015-12-28 18:17:12 +01:00
commit 54537cdfb3

View file

@ -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