diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-08 11:40:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-08 11:40:45 +0200 |
| commit | 58e5f6a4332077eb7e1cfd8a6a3d0bc59759386d (patch) | |
| tree | d6d4d0ec7615b0cf840e970a28fe97ae51f9238d | |
| parent | e3d34100e73c256e250534d64eb5f07daf3d0fef (diff) | |
| parent | 85ac12587bfef970d0e0e4abc292df346daf8478 (diff) | |
| download | ffmpeg-58e5f6a4332077eb7e1cfd8a6a3d0bc59759386d.tar.gz | |
oMerge commit '85ac12587bfef970d0e0e4abc292df346daf8478'
* commit '85ac12587bfef970d0e0e4abc292df346daf8478':
nuv: check ff_rtjpeg_decode_frame_yuv420 return value
Conflicts:
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/nuv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 38f92e9f3d..85172e964f 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -157,7 +157,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 size_change = 0; int result, init_frame = !avctx->frame_number; enum { @@ -277,7 +277,9 @@ retry: } 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); |