mirror of https://git.ffmpeg.org/ffmpeg.git
avfilter/vf_mergeplanes: Free inpads' names generically
Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
2142e71911
commit
0ba9089aec
|
@ -96,11 +96,9 @@ 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 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -279,12 +277,8 @@ static int activate(AVFilterContext *ctx)
|
||||||
static av_cold void uninit(AVFilterContext *ctx)
|
static av_cold void uninit(AVFilterContext *ctx)
|
||||||
{
|
{
|
||||||
MergePlanesContext *s = ctx->priv;
|
MergePlanesContext *s = ctx->priv;
|
||||||
int i;
|
|
||||||
|
|
||||||
ff_framesync_uninit(&s->fs);
|
ff_framesync_uninit(&s->fs);
|
||||||
|
|
||||||
for (i = 0; i < ctx->nb_inputs; i++)
|
|
||||||
av_freep(&ctx->input_pads[i].name);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const AVFilterPad mergeplanes_outputs[] = {
|
static const AVFilterPad mergeplanes_outputs[] = {
|
||||||
|
|
Loading…
Reference in New Issue