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

oMerge commit '85ac12587bfef970d0e0e4abc292df346daf8478'

Browse Source 
* commit '85ac12587bfef970d0e0e4abc292df346daf8478':
  nuv: check ff_rtjpeg_decode_frame_yuv420 return value

Conflicts:
	libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-08 11:40:45 +02:00
commit 58e5f6a433
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/nuv.c
View File

@ -157,7 +157,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
NuvContext *c = avctx->priv_data; NuvContext *c = avctx->priv_data;
AVFrame *picture = data; AVFrame *picture = data;
int orig_size = buf_size; int orig_size = buf_size;
int keyframe; int keyframe, ret;
int size_change = 0; int size_change = 0;
int result, init_frame = !avctx->frame_number; int result, init_frame = !avctx->frame_number;
enum { enum {
@ -277,7 +277,9 @@ retry:
} }
case NUV_RTJPEG_IN_LZO: case NUV_RTJPEG_IN_LZO:
case NUV_RTJPEG: 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; break;
case NUV_BLACK: case NUV_BLACK:
memset(c->pic.data[0], 0, c->width * c->height); memset(c->pic.data[0], 0, c->width * c->height);