From a79852f1c14aec91be999beb3f23473556321a35 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Wed, 11 Aug 2021 22:02:44 +0200 Subject: avfilter/f_streamselect: Free pads' names generically Reviewed-by: Nicolas George Signed-off-by: Andreas Rheinhardt --- libavfilter/f_streamselect.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'libavfilter/f_streamselect.c') diff --git a/libavfilter/f_streamselect.c b/libavfilter/f_streamselect.c index da2391898f..c5427672e2 100644 --- a/libavfilter/f_streamselect.c +++ b/libavfilter/f_streamselect.c @@ -167,16 +167,13 @@ static int parse_definition(AVFilterContext *ctx, int nb_pads, int is_input, int av_log(ctx, AV_LOG_DEBUG, "Add %s pad %s\n", padtype, pad.name); if (is_input) { - ret = ff_append_inpad(ctx, &pad); + ret = ff_append_inpad_free_name(ctx, &pad); } else { pad.config_props = config_output; - ret = ff_append_outpad(ctx, &pad); + ret = ff_append_outpad_free_name(ctx, &pad); } - - if (ret < 0) { - av_freep(&pad.name); + if (ret < 0) return ret; - } } return 0; @@ -295,12 +292,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->map); av_freep(&s->frames); ff_framesync_uninit(&s->fs); - - for (int i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); - - for (int i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); } static int query_formats(AVFilterContext *ctx) -- cgit v1.2.3