Commit 23f589e0 authored by Paul B Mahol's avatar Paul B Mahol

avfilter/vf_alphamerge: do not check for ret value if all wanted frames are present

It is not needed and may be uninitialized.
parent ae432354
...@@ -154,14 +154,12 @@ static int activate(AVFilterContext *ctx) ...@@ -154,14 +154,12 @@ static int activate(AVFilterContext *ctx)
} }
if (s->main_frame && s->alpha_frame) { if (s->main_frame && s->alpha_frame) {
if (ret > 0) {
draw_frame(ctx, s->main_frame, s->alpha_frame); draw_frame(ctx, s->main_frame, s->alpha_frame);
ret = ff_filter_frame(outlink, s->main_frame); ret = ff_filter_frame(outlink, s->main_frame);
av_frame_free(&s->alpha_frame); av_frame_free(&s->alpha_frame);
s->main_frame = NULL; s->main_frame = NULL;
return ret; return ret;
} }
}
FF_FILTER_FORWARD_STATUS(ctx->inputs[0], outlink); FF_FILTER_FORWARD_STATUS(ctx->inputs[0], outlink);
FF_FILTER_FORWARD_STATUS(ctx->inputs[1], outlink); FF_FILTER_FORWARD_STATUS(ctx->inputs[1], outlink);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment