diff mbox series

[FFmpeg-devel,v3,08/25] avfilter/af_join: Free inpads' names generically

Message ID PR3PR03MB6665997E75D3FE21C53616EA8FC39@PR3PR03MB6665.eurprd03.prod.outlook.com
State Accepted
Commit d2e72473dffb4090c4568a21fcdcc8f709a17c80
Headers show
Series [FFmpeg-devel,v3,01/25] avfilter/internal: Uninline ff_insert_(in|out)pad() | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Andreas Rheinhardt Aug. 22, 2021, 12:47 a.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavfilter/af_join.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
diff mbox series

Patch

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);