diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2015-10-01 11:48:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-08 15:21:39 +0200 |
| commit | 64b659673a1ccc74b219b364f58bcd7b8dddb256 (patch) | |
| tree | e4cd3ee68a45c5908b5613d307c5ebf0306d62a3 | |
| parent | 1d9d300d6514de851504255e4eb1e52117c6992f (diff) | |
| download | ffmpeg-64b659673a1ccc74b219b364f58bcd7b8dddb256.tar.gz | |
avformat/srtdec: more lenient first line probing
Fixes Ticket #4898
(cherry picked from commit 7218352e0228028dfa009a3799ec93fd041065f1)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/srtdec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c index fda055b176..44f9b4a879 100644 --- a/libavformat/srtdec.c +++ b/libavformat/srtdec.c @@ -41,9 +41,11 @@ static int srt_probe(AVProbeData *p) ff_text_r8(&tr); /* Check if the first non-empty line is a number. We do not check what the - * number is because in practice it can be anything. */ + * number is because in practice it can be anything. + * Also, that number can be followed by random garbage, so we can not + * unfortunately check that we only have a number. */ if (ff_subtitles_read_line(&tr, buf, sizeof(buf)) < 0 || - strtol(buf, &pbuf, 10) < 0 || *pbuf) + strtol(buf, &pbuf, 10) < 0) return 0; /* Check if the next line matches a SRT timestamp */ |