eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

nuv: check ff_rtjpeg_decode_frame_yuv420 return value

Browse Source 
CC: libav-stable@libav.org
(cherry picked from commit 85ac12587b)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Conflicts:
	libavcodec/nuv.c
This commit is contained in:
Luca Barbato
2013-08-11 20:35:40 +02:00
parent b01e4d80c6
commit 0eb465f981
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/nuv.c
+4 -1
View File
@@ -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);