starred/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-01-23 23:21:06 +01:00
Code Issues 5 Projects Packages Wiki Activity Actions

avfilter/vf_xfade_opencl: Check ff_inlink_consume_frame() for failure

Browse source 
Fixes: CID1458127 Unchecked return value

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 43b62b7e0c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2024-07-12 00:28:14 +02:00
parent dd1058a7b4
commit d392adb19a
No known key found for this signature in database
GPG key ID: B18E8928B3948D64
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libavfilter/vf_xfade_opencl.c
View file

@ -293,7 +293,9 @@ static int xfade_opencl_activate(AVFilterContext *avctx)
if (ctx->first_pts + ctx->offset_pts > ctx->xf[0]->pts) {
ctx->xf[0] = NULL;
ctx->need_second = 0;
ff_inlink_consume_frame(avctx->inputs[0], &in);
ret = ff_inlink_consume_frame(avctx->inputs[0], &in);
if (ret < 0)
return ret;
return ff_filter_frame(outlink, in);
}
@ -302,8 +304,14 @@ static int xfade_opencl_activate(AVFilterContext *avctx)
}
if (ctx->xf[0] && ff_inlink_queued_frames(avctx->inputs[1]) > 0) {
ff_inlink_consume_frame(avctx->inputs[0], &ctx->xf[0]);
ff_inlink_consume_frame(avctx->inputs[1], &ctx->xf[1]);
ret = ff_inlink_consume_frame(avctx->inputs[0], &ctx->xf[0]);
if (ret < 0)
return ret;
ret = ff_inlink_consume_frame(avctx->inputs[1], &ctx->xf[1]);
if (ret < 0) {
av_frame_free(&ctx->xf[0]);
return ret;
}
ctx->last_pts = ctx->xf[1]->pts;
ctx->pts = ctx->xf[0]->pts;