diff options
| author | Ricardo Constantino <wiiaboo@gmail.com> | 2015-10-11 17:11:02 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2015-10-12 22:16:12 +0200 |
| commit | 6eaf97c2894ddd8031d1cbcf1061a84920e93a91 (patch) | |
| tree | 5728de2eecc340421216278808c1ee36f1edb5b1 | |
| parent | a96dbdc14f3db1374f231ede58a6ae6e3211d265 (diff) | |
| download | ffmpeg-6eaf97c2894ddd8031d1cbcf1061a84920e93a91.tar.gz | |
avformat/webvttdec: Don't stop parsing on comments
Signed-off-by: Ricardo Constantino <wiiaboo@gmail.com>
| -rw-r--r-- | libavformat/webvttdec.c | 3 | ||||
| -rw-r--r-- | tests/ref/fate/sub-webvtt2 | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/webvttdec.c b/libavformat/webvttdec.c index 43c2a639ad..47a3255fd0 100644 --- a/libavformat/webvttdec.c +++ b/libavformat/webvttdec.c @@ -92,7 +92,8 @@ static int webvtt_read_header(AVFormatContext *s) /* ignore header chunk */ if (!strncmp(p, "\xEF\xBB\xBFWEBVTT", 9) || - !strncmp(p, "WEBVTT", 6)) + !strncmp(p, "WEBVTT", 6) || + !strncmp(p, "NOTE", 4)) continue; /* optional cue identifier (can be a number like in SRT or some kind of diff --git a/tests/ref/fate/sub-webvtt2 b/tests/ref/fate/sub-webvtt2 index 7f23bdedc7..9f7827d66f 100644 --- a/tests/ref/fate/sub-webvtt2 +++ b/tests/ref/fate/sub-webvtt2 @@ -21,3 +21,4 @@ Dialogue: 0,0:00:43.00,0:00:46.00,Default,,0,0,0,,{\i1}キツネ{\i0}じゃな Dialogue: 0,0:00:50.00,0:00:55.00,Default,,0,0,0,,Some time ago in a rather distant place....
Dialogue: 0,0:00:55.00,0:01:00.00,Default,,0,0,0,,Descending: 123456\NAscending: 123456
Dialogue: 0,0:01:00.00,0:01:05.00,Default,,0,0,0,,>> Never gonna give you up Never gonna let you down\NNever\hgonna\hrun\haround & desert\hyou
+Dialogue: 0,0:55:00.00,1:00:00.00,Default,,0,0,0,,Transcrit par Célestes™
|