diff options
| author | Yen Chi Hsuan <yan12125@gmail.com> | 2016-05-21 13:16:28 +0800 |
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2016-05-21 13:16:28 +0800 |
| commit | 7b2fcbfd4ea34e6d29484f5987a36665117aefaa (patch) | |
| tree | eb42e03ca561db564123c3c0e945a648e55bb75f | |
| parent | 16da9bbc29b76b6e6e1a6134a17e9f25d91296c8 (diff) | |
| download | youtube-dl-7b2fcbfd4ea34e6d29484f5987a36665117aefaa.tar.gz youtube-dl-7b2fcbfd4ea34e6d29484f5987a36665117aefaa.tar.xz youtube-dl-7b2fcbfd4ea34e6d29484f5987a36665117aefaa.zip | |
[common] Skip TYPE=CLOSED-CAPTIONS lines in m3u8 manifests
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
| -rw-r--r-- | youtube_dl/extractor/common.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 17e866f91..4bfa610c1 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -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 |