[FFmpeg-cvslog] nuv: check ff_rtjpeg_decode_frame_yuv420 return value

Luca Barbato git at videolan.org
Sun Sep 8 11:46:35 CEST 2013


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Sun Aug 11 20:35:40 2013 +0200| [85ac12587bfef970d0e0e4abc292df346daf8478] | committer: Luca Barbato

nuv: check ff_rtjpeg_decode_frame_yuv420 return value

CC: libav-stable at libav.org

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

 libavcodec/nuv.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index 7e265bc..58a61e4 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -153,7 +153,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     NuvContext *c      = avctx->priv_data;
     AVFrame *picture   = data;
     int orig_size      = buf_size;
-    int keyframe;
+    int keyframe, ret;
     int result, init_frame = !avctx->frame_number;
     enum {
         NUV_UNCOMPRESSED  = '0',
@@ -263,7 +263,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