generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nuv: check rtjpeg_decode_frame_yuv420 return value

Browse Source 
CC: libav-stable@libav.org
(cherry picked from commit 85ac12587bfef970d0e0e4abc292df346daf8478)
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 abb41f19cc
commit 4a11d773f9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/nuv.c
View File

@ -145,6 +145,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
int orig_size = buf_size;
int keyframe;
int result;
int ret;
enum {NUV_UNCOMPRESSED = '0', NUV_RTJPEG = '1',
NUV_RTJPEG_IN_LZO = '2', NUV_LZO = '3',
NUV_BLACK = 'N', NUV_COPY_LAST = 'L'} comptype;
@ -239,7 +240,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
}
case NUV_RTJPEG_IN_LZO:
case NUV_RTJPEG: {
rtjpeg_decode_frame_yuv420(&c->rtj, &c->pic, buf, buf_size);
ret = rtjpeg_decode_frame_yuv420(&c->rtj, &c->pic, buf, buf_size);
if (ret < 0)
return ret;
break;
}
case NUV_BLACK: {