[dailymotion] Extract f4m formats

This commit is contained in:
Sergey M․ 2015-10-24 21:04:09 +06:00
parent ec29539e06
commit 8e82ecfe8f

View File

@ -141,9 +141,17 @@ def _real_extract(self, url):
type_ = media.get('type') type_ = media.get('type')
if type_ == 'application/vnd.lumberjack.manifest': if type_ == 'application/vnd.lumberjack.manifest':
continue continue
if type_ == 'application/x-mpegURL' or determine_ext(media_url) == 'm3u8': ext = determine_ext(media_url)
formats.extend(self._extract_m3u8_formats( if type_ == 'application/x-mpegURL' or ext == 'm3u8':
media_url, video_id, 'mp4', m3u8_id='hls')) m3u8_formats = self._extract_m3u8_formats(
media_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
if m3u8_formats:
formats.extend(m3u8_formats)
elif type_ == 'application/f4m' or ext == 'f4m':
f4m_formats = self._extract_f4m_formats(
media_url, video_id, preference=-1, f4m_id='hds', fatal=False)
if f4m_formats:
formats.extend(f4m_formats)
else: else:
f = { f = {
'url': media_url, 'url': media_url,