summaryrefslogtreecommitdiff
path: root/libavfilter/af_join.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-08-11 22:02:44 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-08-22 16:13:47 +0200
commitd2e72473dffb4090c4568a21fcdcc8f709a17c80 (patch)
treecd195225c1c1f2ad97411380c2b1817c4733bcbb /libavfilter/af_join.c
parentad5d056dc37d3df199aaf5055a05bd9b5a24836a (diff)
downloadffmpeg-d2e72473dffb4090c4568a21fcdcc8f709a17c80.tar.gz
avfilter/af_join: Free inpads' names generically
Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavfilter/af_join.c')
-rw-r--r--libavfilter/af_join.c8
1 files changed, 1 insertions, 7 deletions
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);