[FFmpeg-cvslog] mjpegdec: rgb mode is specific for ljpeg, disable it for others.
Michael Niedermayer
git at videolan.org
Sun Jan 27 23:56:26 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 27 23:45:44 2013 +0100| [4ade824e1f6a27f2357098d8e7e615f1b524a588] | committer: Michael Niedermayer
mjpegdec: rgb mode is specific for ljpeg, disable it for others.
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ade824e1f6a27f2357098d8e7e615f1b524a588
---
libavcodec/mjpegdec.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index fc428df..299c081 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -300,6 +300,8 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
if (s->v_max == 1 && s->h_max == 1 && s->lossless==1 && nb_components==3)
s->rgb = 1;
+ else if (!s->lossless)
+ s->rgb = 0;
/* if different size, realloc/alloc picture */
if ( width != s->width || height != s->height
More information about the ffmpeg-cvslog
mailing list