RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_minterpolate: Remove redundant code for freeing 

ad73b32d29 added some code for freeing in
the input's config_props function, yet this is unnecessary as uninit is
called anyway if config_props fails.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-10-06 15:10:43 +02:00
parent aa262dcce8
commit 358c0bb168
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavfilter/vf_minterpolate.c
View File

@ -340,7 +340,7 @@ static int config_input(AVFilterLink *inlink)
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
const int height = inlink->h;
const int width = inlink->w;
int i, ret = 0;
int i;
mi_ctx->log2_chroma_h = desc->log2_chroma_h;
mi_ctx->log2_chroma_w = desc->log2_chroma_w;
@ -380,10 +380,8 @@ static int config_input(AVFilterLink *inlink)
mi_ctx->pixel_mvs = av_mallocz_array(width * height, sizeof(PixelMVS));
mi_ctx->pixel_weights = av_mallocz_array(width * height, sizeof(PixelWeights));
mi_ctx->pixel_refs = av_mallocz_array(width * height, sizeof(PixelRefs));
if (!mi_ctx->pixel_mvs || !mi_ctx->pixel_weights || !mi_ctx->pixel_refs) {
ret = AVERROR(ENOMEM);
goto fail;
}
if (!mi_ctx->pixel_mvs || !mi_ctx->pixel_weights || !mi_ctx->pixel_refs)
return AVERROR(ENOMEM);
if (mi_ctx->me_mode == ME_MODE_BILAT)
if (!(mi_ctx->int_blocks = av_mallocz_array(mi_ctx->b_count, sizeof(Block))))
@ -405,13 +403,6 @@ static int config_input(AVFilterLink *inlink)
}
return 0;
fail:
for (i = 0; i < NB_FRAMES; i++)
av_freep(&mi_ctx->frames[i].blocks);
av_freep(&mi_ctx->pixel_mvs);
av_freep(&mi_ctx->pixel_weights);
av_freep(&mi_ctx->pixel_refs);
return ret;
}
static int config_output(AVFilterLink *outlink)