diff mbox series

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

Message ID PR3PR03MB66651D5929C14D6334DE18148FC39@PR3PR03MB6665.eurprd03.prod.outlook.com
State Accepted
Commit 414c1b9b62f364c5d02714f4d1234a77442d8261
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_amerge.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 0e8bdea436..d67e3d7e32 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -60,8 +60,6 @@  static av_cold void uninit(AVFilterContext *ctx)
     AMergeContext *s = ctx->priv;
 
     av_freep(&s->in);
-    for (unsigned i = 0; i < ctx->nb_inputs; i++)
-        av_freep(&ctx->input_pads[i].name);
 }
 
 static int query_formats(AVFilterContext *ctx)
@@ -328,10 +326,8 @@  static av_cold int init(AVFilterContext *ctx)
         };
         if (!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;
 }