avfilter/vf_mix: Free inpads' names generically

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
pull/365/head
Andreas Rheinhardt 4 years ago
parent 0ba9089aec
commit 97c796176e
  1. 9
      libavfilter/vf_mix.c

@ -125,10 +125,8 @@ static av_cold int init(AVFilterContext *ctx)
if (!pad.name)
return AVERROR(ENOMEM);
if ((ret = ff_append_inpad(ctx, &pad)) < 0) {
av_freep(&pad.name);
if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0)
return ret;
}
}
}
@ -304,10 +302,7 @@ static av_cold void uninit(AVFilterContext *ctx)
ff_framesync_uninit(&s->fs);
av_freep(&s->weights);
if (!s->tmix) {
for (i = 0; i < ctx->nb_inputs; i++)
av_freep(&ctx->input_pads[i].name);
} else {
if (s->tmix) {
for (i = 0; i < s->nb_frames && s->frames; i++)
av_frame_free(&s->frames[i]);
}

Loading…
Cancel
Save