[FFmpeg-cvslog] avformat/webvttdec: Accept \r as newline

Andreas Rheinhardt git at videolan.org
Fri Jun 26 08:58:00 EEST 2020

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sat Jun 20 07:06:04 2020 +0200| [7447045cc0dacf9eedf230070c0675eecf546ff6] | committer: Andreas Rheinhardt

avformat/webvttdec: Accept \r as newline

After parsing the end timestamp of a WebVTT cue block, the current code
skips everything after the start of the timestamp that is not a \t, ' '
or \n and treats what is next as the start of a WebVTT cue settings list.
Yet if there is no such list, but a single \r, this will skip a part of
the cue payload (namely everything until the first occurence of \t, ' '
or \n) and treat what has not been skipped as the beginning of the
WebVTT cue settings list that extends until the next \r or \n (or the

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7447045cc0dacf9eedf230070c0675eecf546ff6

 libavformat/webvttdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/webvttdec.c b/libavformat/webvttdec.c
index bd3d45b382..8d2fdfed37 100644
--- a/libavformat/webvttdec.c
+++ b/libavformat/webvttdec.c
@@ -125,7 +125,7 @@ static int webvtt_read_header(AVFormatContext *s)
         /* optional cue settings */
-        p += strcspn(p, "\n\t ");
+        p += strcspn(p, "\n\r\t ");
         while (*p == '\t' || *p == ' ')
         settings = p;

More information about the ffmpeg-cvslog mailing list