summaryrefslogtreecommitdiff
path: root/libavcodec/mjpegdec.c
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2008-08-04 08:25:38 +0000
committerBenoit Fouet <benoit.fouet@free.fr>2008-08-04 08:25:38 +0000
commit0e589ce1518237863a8e63e3dccdd732f86e469f (patch)
tree25b780d1b34bd38d4c63537acfad8e46c66f8490 /libavcodec/mjpegdec.c
parentcc0b61292af652bab0b7870b6293bf827bf42e7a (diff)
Return an error when ff_jpegls_decode_picture fails.
Patch by Mathieu Malaterre: name.surname at gmail Originally committed as revision 14535 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mjpegdec.c')
-rw-r--r--libavcodec/mjpegdec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 06394f566b..b302c8a05a 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -834,7 +834,8 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s)
// for(){
// reset_ls_coding_parameters(s, 0);
- ff_jpegls_decode_picture(s, predictor, point_transform, ilv);
+ if(ff_jpegls_decode_picture(s, predictor, point_transform, ilv) < 0)
+ return -1;
}else{
if(s->rgb){
if(ljpeg_decode_rgb_scan(s, predictor, point_transform) < 0)