avfilter/f_interleave: 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
fbfcb012ac
commit
b8e31568df
|
@ -173,21 +173,13 @@ static av_cold int init(AVFilterContext *ctx)
|
||||||
default:
|
default:
|
||||||
av_assert0(0);
|
av_assert0(0);
|
||||||
}
|
}
|
||||||
if ((ret = ff_append_inpad(ctx, &inpad)) < 0) {
|
if ((ret = ff_append_inpad_free_name(ctx, &inpad)) < 0)
|
||||||
av_freep(&inpad.name);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static av_cold void uninit(AVFilterContext *ctx)
|
|
||||||
{
|
|
||||||
for (int i = 0; i < ctx->nb_inputs; i++)
|
|
||||||
av_freep(&ctx->input_pads[i].name);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int config_output(AVFilterLink *outlink)
|
static int config_output(AVFilterLink *outlink)
|
||||||
{
|
{
|
||||||
AVFilterContext *ctx = outlink->src;
|
AVFilterContext *ctx = outlink->src;
|
||||||
|
@ -242,7 +234,6 @@ const AVFilter ff_vf_interleave = {
|
||||||
.description = NULL_IF_CONFIG_SMALL("Temporally interleave video inputs."),
|
.description = NULL_IF_CONFIG_SMALL("Temporally interleave video inputs."),
|
||||||
.priv_size = sizeof(InterleaveContext),
|
.priv_size = sizeof(InterleaveContext),
|
||||||
.init = init,
|
.init = init,
|
||||||
.uninit = uninit,
|
|
||||||
.activate = activate,
|
.activate = activate,
|
||||||
FILTER_OUTPUTS(interleave_outputs),
|
FILTER_OUTPUTS(interleave_outputs),
|
||||||
.priv_class = &interleave_class,
|
.priv_class = &interleave_class,
|
||||||
|
@ -269,7 +260,6 @@ const AVFilter ff_af_ainterleave = {
|
||||||
.description = NULL_IF_CONFIG_SMALL("Temporally interleave audio inputs."),
|
.description = NULL_IF_CONFIG_SMALL("Temporally interleave audio inputs."),
|
||||||
.priv_size = sizeof(InterleaveContext),
|
.priv_size = sizeof(InterleaveContext),
|
||||||
.init = init,
|
.init = init,
|
||||||
.uninit = uninit,
|
|
||||||
.activate = activate,
|
.activate = activate,
|
||||||
FILTER_OUTPUTS(ainterleave_outputs),
|
FILTER_OUTPUTS(ainterleave_outputs),
|
||||||
.priv_class = &ainterleave_class,
|
.priv_class = &ainterleave_class,
|
||||||
|
|
Loading…
Reference in New Issue