]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[limelight] fix format sorting and make m3u8 and f4m extraction non fatal
authorremitamine <remitamine@gmail.com>
Sat, 30 Jan 2016 19:51:47 +0000 (20:51 +0100)
committerremitamine <remitamine@gmail.com>
Sat, 30 Jan 2016 19:51:47 +0000 (20:51 +0100)
youtube_dl/extractor/limelight.py

index fb03dd52782e70d91021d7d520e99bd7dba60bd8..1a0625ac3e0eeefa5ca18e968ae69e210a960662 100644 (file)
@@ -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,