[FFmpeg-cvslog] nuv: check ff_rtjpeg_decode_frame_yuv420 return value

Luca Barbato git at videolan.org
Mon Sep 9 09:31:15 CEST 2013


ffmpeg | branch: release/1.1 | Luca Barbato <lu_zero at gentoo.org> | Sun Aug 11 20:35:40 2013 +0200| [0eb465f981de014becd4c99c8d6ad4523ad81ad1] | committer: Luca Barbato

nuv: check ff_rtjpeg_decode_frame_yuv420 return value

CC: libav-stable at libav.org
(cherry picked from commit 85ac12587bfef970d0e0e4abc292df346daf8478)
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

Conflicts:
	libavcodec/nuv.c

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

 libavcodec/nuv.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index 9c765a0..e253bfb 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -156,6 +156,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     int orig_size      = buf_size;
     int keyframe;
     int result;
+    int ret;
     enum {
         NUV_UNCOMPRESSED  = '0',
         NUV_RTJPEG        = '1',
@@ -259,7 +260,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     }
     case NUV_RTJPEG_IN_LZO:
     case NUV_RTJPEG:
-        ff_rtjpeg_decode_frame_yuv420(&c->rtj, &c->pic, buf, buf_size);
+        ret = ff_rtjpeg_decode_frame_yuv420(&c->rtj, &c->pic, buf, buf_size);
+        if (ret < 0)
+            return ret;
         break;
     case NUV_BLACK:
         memset(c->pic.data[0], 0, c->width * c->height);



More information about the ffmpeg-cvslog mailing list