highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_mix: Free inpads' names generically

Browse Source 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-08-11 22:02:44 +02:00
parent 0ba9089aec
commit 97c796176e
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavfilter/vf_mix.c
View File

@@ -125,12 +125,10 @@ static av_cold int init(AVFilterContext *ctx)
if (!pad.name) if (!pad.name)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if ((ret = ff_append_inpad(ctx, &pad)) < 0) { if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0)
av_freep(&pad.name);
return ret; return ret;
} }
} }
}
return parse_weights(ctx); return parse_weights(ctx);
} }
@@ -304,10 +302,7 @@ static av_cold void uninit(AVFilterContext *ctx)
ff_framesync_uninit(&s->fs); ff_framesync_uninit(&s->fs);
av_freep(&s->weights); av_freep(&s->weights);
if (!s->tmix) { if (s->tmix) {
for (i = 0; i < ctx->nb_inputs; i++)
av_freep(&ctx->input_pads[i].name);
} else {
for (i = 0; i < s->nb_frames && s->frames; i++) for (i = 0; i < s->nb_frames && s->frames; i++)
av_frame_free(&s->frames[i]); av_frame_free(&s->frames[i]);
} }