diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2015-10-01 11:48:45 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-10-09 21:55:34 +0200 |
| commit | 2e575c1e8dd7ab5e050caf431693fbf8b69f2c7f (patch) | |
| tree | 4a9f817a891a0e11290d4a4d91d62aa0bb353451 | |
| parent | 628479b096fe4d74841e6c2904cc9646544424b1 (diff) | |
| download | ffmpeg-2e575c1e8dd7ab5e050caf431693fbf8b69f2c7f.tar.gz | |
avformat/srtdec: more lenient first line probing
Fixes Ticket #4898
(cherry picked from commit 7218352e0228028dfa009a3799ec93fd041065f1)
| -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 b35e50fc36..7fee0fc2d1 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 */ |