diff options
| author | wm4 <nfxjfg@googlemail.com> | 2015-07-29 22:33:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-20 14:38:28 +0200 |
| commit | 43956940ea20b8f51ec6d34ced42c63f853072bb (patch) | |
| tree | dd124c3abeb7510d7f394fcee58b009deb19d19b | |
| parent | 2d582d142c185fbf7bc9240903423c9bbac7784f (diff) | |
| download | ffmpeg-43956940ea20b8f51ec6d34ced42c63f853072bb.tar.gz | |
rawdec: fix mjpeg probing buffer size check
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 4c6beaed9210f01290e5a5a4e377f93f145172cc)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/rawdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index 19bdfc3afd..b747bbd014 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -189,7 +189,7 @@ static int mjpeg_probe(AVProbeData *p) static const char ct_jpeg[] = "\r\nContent-Type: image/jpeg\r\n"; int i; - for (i=0; i<FFMIN(p->buf_size - sizeof(ct_jpeg), 100); i++) + for (i=0; i<FFMIN(p->buf_size - (int)sizeof(ct_jpeg), 100); i++) if (!memcmp(p->buf + i, ct_jpeg, sizeof(ct_jpeg) - 1)) return AVPROBE_SCORE_EXTENSION; |