Merge commit '68e547ae8b455e5e2b60839f35c359d77a6d94bc'

[ffmpeg] / libavformat / assdec.c

diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index a9a2efac2e4f8c431de8803e86518bf9368179de..21148b60f9a608161bc53532560ec9fb8e5b9548 100644 (file)
--- 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))