ffmpeg | branch: release/2.7 | wm4 <nfx...@googlemail.com> | Wed Jul 29 22:33:44 2015 +0200| [1900d023ae7b40c0a9b0cc65f0b0fc2814857258] | committer: Michael Niedermayer
rawdec: fix mjpeg probing buffer size check Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit 4c6beaed9210f01290e5a5a4e377f93f145172cc) Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1900d023ae7b40c0a9b0cc65f0b0fc2814857258 --- libavformat/rawdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index caa209f..7684e1d 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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
