aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2016-01-30 20:51:47 +0100
committerremitamine <remitamine@gmail.com>2016-01-30 20:51:47 +0100
commit8f1fddc816dac7c0e9b216e85474aa8eb0d847bf (patch)
tree1935ca907b6bf17c350235e687fd2dc5d0617776 /youtube_dl
parent1bf996fa5cd996c5f586089388853e324dc3850d (diff)
[limelight] fix format sorting and make m3u8 and f4m extraction non fatal
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/limelight.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/youtube_dl/extractor/limelight.py b/youtube_dl/extractor/limelight.py
index fb03dd527..1a0625ac3 100644
--- a/youtube_dl/extractor/limelight.py
+++ b/youtube_dl/extractor/limelight.py
@@ -40,7 +40,8 @@ class LimelightBaseIE(InfoExtractor):
if not stream_url:
continue
if '.f4m' in stream_url:
- formats.extend(self._extract_f4m_formats(stream_url, video_id))
+ formats.extend(self._extract_f4m_formats(
+ stream_url, video_id, fatal=False))
else:
fmt = {
'url': stream_url,
@@ -72,8 +73,8 @@ class LimelightBaseIE(InfoExtractor):
format_id = mobile_url.get('targetMediaPlatform')
if determine_ext(media_url) == 'm3u8':
formats.extend(self._extract_m3u8_formats(
- media_url, video_id, 'mp4', entry_protocol='m3u8_native',
- preference=-1, m3u8_id=format_id))
+ media_url, video_id, 'mp4', 'm3u8_native',
+ m3u8_id=format_id, fatal=False))
else:
formats.append({
'url': media_url,