diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-08-11 20:35:40 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-09-07 12:09:06 +0200 |
| commit | 0eb465f981de014becd4c99c8d6ad4523ad81ad1 (patch) | |
| tree | f74500a63e75725ae6ee4fa19faa541cd252f54d | |
| parent | b01e4d80c69da83d765263dd774fbbc4a2944b97 (diff) | |
| download | ffmpeg-0eb465f981de014becd4c99c8d6ad4523ad81ad1.tar.gz | |
nuv: check ff_rtjpeg_decode_frame_yuv420 return value
CC: libav-stable@libav.org
(cherry picked from commit 85ac12587bfef970d0e0e4abc292df346daf8478)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Conflicts:
libavcodec/nuv.c
| -rw-r--r-- | libavcodec/nuv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 9c765a0f64..e253bfbbed 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); |