From 97c796176e4eee495eb1a5d1c4469cc9fc2d0bdc Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Wed, 11 Aug 2021 22:02:44 +0200 Subject: [PATCH] avfilter/vf_mix: Free inpads' names generically Reviewed-by: Nicolas George Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_mix.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index a581dfc8ef..ce66202557 100644 --- a/libavfilter/vf_mix.c +++ b/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]); }