From d2e72473dffb4090c4568a21fcdcc8f709a17c80 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Wed, 11 Aug 2021 22:02:44 +0200 Subject: avfilter/af_join: Free inpads' names generically Reviewed-by: Nicolas George Signed-off-by: Andreas Rheinhardt --- libavfilter/af_join.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'libavfilter/af_join.c') diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index 8e57dfb8b9..c8e58260da 100644 --- a/libavfilter/af_join.c +++ b/libavfilter/af_join.c @@ -194,10 +194,8 @@ static av_cold int join_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; @@ -212,10 +210,6 @@ static av_cold void join_uninit(AVFilterContext *ctx) av_frame_free(&s->input_frames[i]); } - for (i = 0; i < ctx->nb_inputs; i++) { - av_freep(&ctx->input_pads[i].name); - } - av_freep(&s->channels); av_freep(&s->buffers); av_freep(&s->input_frames); -- cgit v1.2.3