diff options
| author | wm4 <nfxjfg@googlemail.com> | 2015-07-29 22:33:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-30 19:27:45 +0200 |
| commit | 1eb646ec9f87ed488f52561867e107eaee89e20c (patch) | |
| tree | 95c1cb40ddbd870db371fed543a8f5145a8baf78 | |
| parent | c809cf1c5b1b66fbc14795f3de0dde41c6861356 (diff) | |
| download | ffmpeg-n2.5.8.tar.gz | |
rawdec: fix mjpeg probing buffer size checkn2.5.8
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 6a9085a925..d8dc1c3940 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -191,7 +191,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; |