aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2013-09-08 16:17:46 +0200
committerAlexander Strasser <eclipse7@gmx.net>2013-09-15 22:21:04 +0200
commit59147be24f4bdf16fd8b96217af49e55a1810725 (patch)
tree7b3597764b5641e4aee4d19fdbba58c84016c7fa
parent09bc4be3dbb3c35e8ef784f40bac0fc13a3a1205 (diff)
downloadffmpeg-59147be24f4bdf16fd8b96217af49e55a1810725.tar.gz
avformat/srtdec: skip initial random line breaks.
I found a bunch of (recent) SRT files in the wild with 3 to 10 line breaks at the beginning. (cherry picked from commit cfcd55db164e0acc0c30b2cf084e6eebe9741d34) Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
-rw-r--r--libavformat/srtdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c
index dbf1866202..ac783d9e3b 100644
--- a/libavformat/srtdec.c
+++ b/libavformat/srtdec.c
@@ -37,6 +37,8 @@ static int srt_probe(AVProbeData *p)
if (AV_RB24(ptr) == 0xEFBBBF)
ptr += 3; /* skip UTF-8 BOM */
+ while (*ptr == '\r' || *ptr == '\n')
+ ptr++;
for (i=0; i<2; i++) {
if ((num == i || num + 1 == i)
&& sscanf(ptr, "%*d:%*2d:%*2d%*1[,.]%*3d --> %*d:%*2d:%*2d%*1[,.]%3d", &v) == 1)