[FFmpeg-cvslog] avfilter/af_join: Free inpads' names generically

Andreas Rheinhardt git at videolan.org
Sun Aug 22 19:06:25 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Wed Aug 11 22:02:44 2021 +0200| [d2e72473dffb4090c4568a21fcdcc8f709a17c80] | committer: Andreas Rheinhardt

avfilter/af_join: Free inpads' names generically

Reviewed-by: Nicolas George <george at nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2e72473dffb4090c4568a21fcdcc8f709a17c80
---

 libavfilter/af_join.c | 8 +-------
 1 file changed, 1 insertion(+), 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);



More information about the ffmpeg-cvslog mailing list