mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-26 01:02:33 +00:00
avfilter/vf_xfade_opencl: Check ff_inlink_consume_frame() for failure
Fixes: CID1458127 Unchecked return value Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
191a685010
commit
43b62b7e0c
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user