[FFmpeg-cvslog] r14535 - trunk/libavcodec/mjpegdec.c

benoit subversion
Mon Aug 4 10:25:38 CEST 2008


Author: benoit
Date: Mon Aug  4 10:25:38 2008
New Revision: 14535

Log:
Return an error when ff_jpegls_decode_picture fails.
Patch by Mathieu Malaterre: name.surname at gmail


Modified:
   trunk/libavcodec/mjpegdec.c

Modified: trunk/libavcodec/mjpegdec.c
==============================================================================
--- trunk/libavcodec/mjpegdec.c	(original)
+++ trunk/libavcodec/mjpegdec.c	Mon Aug  4 10:25:38 2008
@@ -834,7 +834,8 @@ int ff_mjpeg_decode_sos(MJpegDecodeConte
 //            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)




More information about the ffmpeg-cvslog mailing list