breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

avfilter/avfilter: Allow to free non-static pads generically

Browse Source 
This can be enabled/disabled on a per-pad basis by setting
the AVFILTERPAD_FLAG_FREE_NAME flag; variants of ff_append_(in|out)pads
that do this for you have been added and will be put to use in the
following commits.

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 21:54:31 +02:00
parent dff1709eb2
commit f308f37441
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libavfilter/avfilter.c
View File

@@ -123,8 +123,11 @@ static int append_pad(unsigned *count, AVFilterPad **pads,
*pads = newpads;
if (newlinks)
*links = newlinks;
if (!newpads || !newlinks)
if (!newpads || !newlinks) {
if (newpad->flags & AVFILTERPAD_FLAG_FREE_NAME)
av_freep(&newpad->name);
return AVERROR(ENOMEM);
}
memcpy(*pads + idx, newpad, sizeof(AVFilterPad));
(*links)[idx] = NULL;
@@ -139,11 +142,23 @@ int ff_append_inpad(AVFilterContext *f, AVFilterPad *p)
return append_pad(&f->nb_inputs, &f->input_pads, &f->inputs, p);
}
int ff_append_inpad_free_name(AVFilterContext *f, AVFilterPad *p)
{
p->flags |= AVFILTERPAD_FLAG_FREE_NAME;
return ff_append_inpad(f, p);
}
int ff_append_outpad(AVFilterContext *f, AVFilterPad *p)
{
return append_pad(&f->nb_outputs, &f->output_pads, &f->outputs, p);
}
int ff_append_outpad_free_name(AVFilterContext *f, AVFilterPad *p)
{
p->flags |= AVFILTERPAD_FLAG_FREE_NAME;
return ff_append_outpad(f, p);
}
int avfilter_link(AVFilterContext *src, unsigned srcpad,
AVFilterContext *dst, unsigned dstpad)
{
@@ -754,9 +769,13 @@ void avfilter_free(AVFilterContext *filter)
for (i = 0; i < filter->nb_inputs; i++) {
free_link(filter->inputs[i]);
if (filter->input_pads[i].flags & AVFILTERPAD_FLAG_FREE_NAME)
av_freep(&filter->input_pads[i].name);
}
for (i = 0; i < filter->nb_outputs; i++) {
free_link(filter->outputs[i]);
if (filter->output_pads[i].flags & AVFILTERPAD_FLAG_FREE_NAME)
av_freep(&filter->output_pads[i].name);
}
if (filter->filter->priv_class)