Skip to content

Commit

Permalink
avfilter/vf_xfade_opencl: Check ff_inlink_consume_frame() for failure
Browse files Browse the repository at this point in the history
Fixes: CID1458127 Unchecked return value

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  • Loading branch information
michaelni committed Aug 11, 2024
1 parent 191a685 commit 43b62b7
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions libavfilter/vf_xfade_opencl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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;
Expand Down

0 comments on commit 43b62b7

Please sign in to comment.