ffmpeg | branch: master | Ricardo Constantino <wiia...@gmail.com> | Sun Oct 11 17:11:02 2015 +0100| [6eaf97c2894ddd8031d1cbcf1061a84920e93a91] | committer: Clément Bœsch
avformat/webvttdec: Don't stop parsing on comments Signed-off-by: Ricardo Constantino <wiia...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6eaf97c2894ddd8031d1cbcf1061a84920e93a91 --- libavformat/webvttdec.c | 3 ++- tests/ref/fate/sub-webvtt2 | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/webvttdec.c b/libavformat/webvttdec.c index 43c2a63..47a3255 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 7f23bde..9f7827d 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™ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
