diff mbox series

[FFmpeg-devel,v3,11/25] avfilter/avf_concat: Free pads' names generically

Message ID PR3PR03MB6665064C2B0DDFE7DAA2DEE18FC39@PR3PR03MB6665.eurprd03.prod.outlook.com
State Accepted
Commit fbfcb012aca8259dd1c03ce3bf3aff1878b630e6
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/avf_concat.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c
index 10f21cecb7..2ae24e9b39 100644
--- a/libavfilter/avf_concat.c
+++ b/libavfilter/avf_concat.c
@@ -319,10 +319,8 @@  static av_cold int init(AVFilterContext *ctx)
                 else
                     pad.get_buffer.audio = get_audio_buffer;
                 pad.name = av_asprintf("in%d:%c%d", seg, "va"[type], str);
-                if ((ret = ff_append_inpad(ctx, &pad)) < 0) {
-                    av_freep(&pad.name);
+                if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0)
                     return ret;
-                }
             }
         }
     }
@@ -334,10 +332,8 @@  static av_cold int init(AVFilterContext *ctx)
                 .config_props  = config_output,
             };
             pad.name = av_asprintf("out:%c%d", "va"[type], str);
-            if ((ret = ff_append_outpad(ctx, &pad)) < 0) {
-                av_freep(&pad.name);
+            if ((ret = ff_append_outpad_free_name(ctx, &pad)) < 0)
                 return ret;
-            }
         }
     }
 
@@ -351,12 +347,7 @@  static av_cold int init(AVFilterContext *ctx)
 static av_cold void uninit(AVFilterContext *ctx)
 {
     ConcatContext *cat = ctx->priv;
-    unsigned i;
 
-    for (i = 0; i < ctx->nb_inputs; i++)
-        av_freep(&ctx->input_pads[i].name);
-    for (i = 0; i < ctx->nb_outputs; i++)
-        av_freep(&ctx->output_pads[i].name);
     av_freep(&cat->in);
 }