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

avfilter/avfilter: Use av_memdup where appropriate

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-09 08:45:00 +02:00
parent c66bb56d9a
commit 35b1f46d79
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/avfilter.c
View File

@ -659,10 +659,9 @@ AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name)
ret->nb_inputs = avfilter_pad_count(filter->inputs); ret->nb_inputs = avfilter_pad_count(filter->inputs);
if (ret->nb_inputs ) { if (ret->nb_inputs ) {
ret->input_pads = av_malloc_array(ret->nb_inputs, sizeof(AVFilterPad)); ret->input_pads = av_memdup(filter->inputs, ret->nb_inputs * sizeof(*filter->inputs));
if (!ret->input_pads) if (!ret->input_pads)
goto err; goto err;
memcpy(ret->input_pads, filter->inputs, sizeof(AVFilterPad) * ret->nb_inputs);
ret->inputs = av_mallocz_array(ret->nb_inputs, sizeof(AVFilterLink*)); ret->inputs = av_mallocz_array(ret->nb_inputs, sizeof(AVFilterLink*));
if (!ret->inputs) if (!ret->inputs)
goto err; goto err;
@ -670,10 +669,9 @@ AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name)
ret->nb_outputs = avfilter_pad_count(filter->outputs); ret->nb_outputs = avfilter_pad_count(filter->outputs);
if (ret->nb_outputs) { if (ret->nb_outputs) {
ret->output_pads = av_malloc_array(ret->nb_outputs, sizeof(AVFilterPad)); ret->output_pads = av_memdup(filter->outputs, ret->nb_outputs * sizeof(*filter->outputs));
if (!ret->output_pads) if (!ret->output_pads)
goto err; goto err;
memcpy(ret->output_pads, filter->outputs, sizeof(AVFilterPad) * ret->nb_outputs);
ret->outputs = av_mallocz_array(ret->nb_outputs, sizeof(AVFilterLink*)); ret->outputs = av_mallocz_array(ret->nb_outputs, sizeof(AVFilterLink*));
if (!ret->outputs) if (!ret->outputs)
goto err; goto err;