From 0ba9089aec43818b30d688810771eee2609f7894 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Wed, 11 Aug 2021 22:02:44 +0200 Subject: [PATCH] avfilter/vf_mergeplanes: Free inpads' names generically Reviewed-by: Nicolas George Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_mergeplanes.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavfilter/vf_mergeplanes.c b/libavfilter/vf_mergeplanes.c index fe68c5c7e7..638a7065f2 100644 --- a/libavfilter/vf_mergeplanes.c +++ b/libavfilter/vf_mergeplanes.c @@ -96,10 +96,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; - } } return 0; @@ -279,12 +277,8 @@ static int activate(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx) { MergePlanesContext *s = ctx->priv; - int i; ff_framesync_uninit(&s->fs); - - for (i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); } static const AVFilterPad mergeplanes_outputs[] = {