har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
It is not needed and may be uninitialized.
This commit is contained in:
Paul B Mahol 2018-11-12 22:07:13 +01:00
parent ae4323548a
commit 23f589e073
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/vf_alphamerge.c
View File

@ -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);