[FFmpeg-cvslog] avfilter/vf_mix: Free inpads' names generically
Andreas Rheinhardt
git at videolan.org
Sun Aug 22 19:06:50 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Wed Aug 11 22:02:44 2021 +0200| [97c796176e4eee495eb1a5d1c4469cc9fc2d0bdc] | committer: Andreas Rheinhardt
avfilter/vf_mix: 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=97c796176e4eee495eb1a5d1c4469cc9fc2d0bdc
---
libavfilter/vf_mix.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c
index a581dfc8ef..ce66202557 100644
--- a/libavfilter/vf_mix.c
+++ b/libavfilter/vf_mix.c
@@ -125,10 +125,8 @@ static av_cold int 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;
- }
}
}
@@ -304,10 +302,7 @@ static av_cold void uninit(AVFilterContext *ctx)
ff_framesync_uninit(&s->fs);
av_freep(&s->weights);
- if (!s->tmix) {
- for (i = 0; i < ctx->nb_inputs; i++)
- av_freep(&ctx->input_pads[i].name);
- } else {
+ if (s->tmix) {
for (i = 0; i < s->nb_frames && s->frames; i++)
av_frame_free(&s->frames[i]);
}
More information about the ffmpeg-cvslog
mailing list