[FFmpeg-cvslog] rawdec: fix mjpeg probing buffer size check

wm4 git at videolan.org
Thu Nov 19 11:27:46 CET 2015


ffmpeg | branch: release/2.6 | wm4 <nfxjfg at googlemail.com> | Wed Jul 29 22:33:44 2015 +0200| [da7d36ef8037357a0be8630ba6c9e9622f249412] | committer: Michael Niedermayer

rawdec: fix mjpeg probing buffer size check

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 4c6beaed9210f01290e5a5a4e377f93f145172cc)

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da7d36ef8037357a0be8630ba6c9e9622f249412
---

 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;
 



More information about the ffmpeg-cvslog mailing list