mirror of https://git.ffmpeg.org/ffmpeg.git
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>
This commit is contained in:
commit
58e5f6a433
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue