Browse Source

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

It is not needed and may be uninitialized.
tags/n4.2
Paul B Mahol 6 years ago
parent
commit
23f589e073
1 changed files with 5 additions and 7 deletions
  1. +5
    -7
      libavfilter/vf_alphamerge.c

+ 5
- 7
libavfilter/vf_alphamerge.c View File

@@ -154,13 +154,11 @@ static int activate(AVFilterContext *ctx)
}

if (s->main_frame && s->alpha_frame) {
if (ret > 0) {
draw_frame(ctx, s->main_frame, s->alpha_frame);
ret = ff_filter_frame(outlink, s->main_frame);
av_frame_free(&s->alpha_frame);
s->main_frame = NULL;
return ret;
}
draw_frame(ctx, s->main_frame, s->alpha_frame);
ret = ff_filter_frame(outlink, s->main_frame);
av_frame_free(&s->alpha_frame);
s->main_frame = NULL;
return ret;
}

FF_FILTER_FORWARD_STATUS(ctx->inputs[0], outlink);


Loading…
Cancel
Save