[FFmpeg-cvslog] avformat/assdec: allow ASS files starting with empty lines

Clément Bœsch git at videolan.org
Fri Nov 20 14:44:30 CET 2015


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Fri Nov 20 14:38:22 2015 +0100| [6679fcd4198d5050de2d43468dd80d0a2ac90d81] | committer: Clément Bœsch

avformat/assdec: allow ASS files starting with empty lines

See https://github.com/mpv-player/mpv/issues/2506

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6679fcd4198d5050de2d43468dd80d0a2ac90d81
---

 libavformat/assdec.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index a9a2efa..21148b6 100644
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -39,6 +39,9 @@ static int ass_probe(AVProbeData *p)
     FFTextReader tr;
     ff_text_init_buf(&tr, p->buf, p->buf_size);
 
+    while (ff_text_peek_r8(&tr) == '\r' || ff_text_peek_r8(&tr) == '\n')
+        ff_text_r8(&tr);
+
     ff_text_read(&tr, buf, sizeof(buf));
 
     if (!memcmp(buf, "[Script Info]", 13))



More information about the ffmpeg-cvslog mailing list