]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[common] Skip TYPE=CLOSED-CAPTIONS lines in m3u8 manifests
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 21 May 2016 05:16:28 +0000 (13:16 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 21 May 2016 05:16:28 +0000 (13:16 +0800)
According to [1], valid values for TYPE are AUDIO, VIDEO, SUBTITLES
and CLOSED-CAPTIONS. Such a value is found in Anvato master playlists,
though I don't use _extract_m3u8_formats() in the end.

Part of #9522.

[1] https://tools.ietf.org/html/draft-pantos-http-live-streaming-19#section-4.3.4.1

youtube_dl/extractor/common.py

index 17e866f9116b48f56703a3d54195e171a20fa17c..4bfa610c168ce354c681220d89600a8e2b229143 100644 (file)
@@ -1141,7 +1141,7 @@ class InfoExtractor(object):
                 format_id = []
                 if m3u8_id:
                     format_id.append(m3u8_id)
-                last_media_name = last_media.get('NAME') if last_media and last_media.get('TYPE') != 'SUBTITLES' else None
+                last_media_name = last_media.get('NAME') if last_media and last_media.get('TYPE') not in ('SUBTITLES', 'CLOSED-CAPTIONS') else None
                 # Despite specification does not mention NAME attribute for
                 # EXT-X-STREAM-INF it still sometimes may be present
                 stream_name = last_info.get('NAME') or last_media_name