Merge pull request #8023 from remitamine/extract-formats

[common] simplify the use of _extract_m3u8_formats and _extract_f4m_formats
pull/8/head
remitamine 9 years ago
commit 54537cdfb3

@ -885,7 +885,7 @@ class InfoExtractor(object):
fatal=fatal) fatal=fatal)
if manifest is False: if manifest is False:
return manifest return []
formats = [] formats = []
manifest_version = '1.0' manifest_version = '1.0'
@ -956,7 +956,7 @@ class InfoExtractor(object):
errnote=errnote or 'Failed to download m3u8 information', errnote=errnote or 'Failed to download m3u8 information',
fatal=fatal) fatal=fatal)
if res is False: if res is False:
return res return []
m3u8_doc, urlh = res m3u8_doc, urlh = res
m3u8_url = urlh.geturl() m3u8_url = urlh.geturl()
last_info = None last_info = None

Loading…
Cancel
Save