]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
Return an error when ff_jpegls_decode_picture fails.
authorbenoit <benoit@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Mon, 4 Aug 2008 08:25:38 +0000 (08:25 +0000)
committerbenoit <benoit@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Mon, 4 Aug 2008 08:25:38 +0000 (08:25 +0000)
Patch by Mathieu Malaterre: name.surname at gmail

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@14535 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/mjpegdec.c

index 06394f566b08603a1971afaa8dc1e614b7a91f46..b302c8a05ad2c9b912f2e975cde9b016077b0442 100644 (file)
@@ -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)