aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <clement@stupeflix.com>2015-10-09 10:52:58 +0200
committerClément Bœsch <clement@stupeflix.com>2015-10-09 10:56:31 +0200
commitee1bcd3436752d8ed4f2d06260d2218d8bdfdc74 (patch)
tree8a2e6dceb3ae03da3374d0c0e28dbc71e649bd44
parent408240267a718f9ece227f1b08b0815c4286729e (diff)
downloadffmpeg-ee1bcd3436752d8ed4f2d06260d2218d8bdfdc74.tar.gz
avformat/srtdec: make sure we probe a number
Fixes regression since 7218352e0228028dfa009a3799ec93fd041065f1: WebVTT files were matching the SRT probing. (cherry picked from commit 40d9d6de90c3652f4c468ab14976c7faf5e40c07)
-rw-r--r--libavformat/srtdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c
index 44f9b4a879..6a6cc9f3e0 100644
--- a/libavformat/srtdec.c
+++ b/libavformat/srtdec.c
@@ -45,7 +45,7 @@ static int srt_probe(AVProbeData *p)
* 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)
+ strtol(buf, &pbuf, 10) < 0 || pbuf == buf)
return 0;
/* Check if the next line matches a SRT timestamp */