depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-26 20:22:14 +00:00
Code Issues Releases Wiki Activity

Merge pull request #8023 from remitamine/extract-formats

Browse source 
[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
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
youtube_dl/extractor/common.py
View file

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