From e740e9c79807b9d0174c037a6b3062b7057d436b Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
Date: Sat, 21 Jan 2017 22:09:03 +0100
Subject: [PATCH] avfilter/vf_palettegen: Fix leak and simplify code
Fixes CID1270818
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavfilter/vf_palettegen.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/libavfilter/vf_palettegen.c b/libavfilter/vf_palettegen.c
index 668a4aee228..5e69873b4cf 100644
--- a/libavfilter/vf_palettegen.c
+++ b/libavfilter/vf_palettegen.c
@@ -95,15 +95,10 @@ static int query_formats(AVFilterContext *ctx)
static const enum AVPixelFormat in_fmts[] = {AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE};
static const enum AVPixelFormat out_fmts[] = {AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE};
int ret;
- AVFilterFormats *in = ff_make_format_list(in_fmts);
- AVFilterFormats *out = ff_make_format_list(out_fmts);
- if (!in || !out) {
- av_freep(&in);
- av_freep(&out);
- return AVERROR(ENOMEM);
- }
- if ((ret = ff_formats_ref(in , &ctx->inputs[0]->out_formats)) < 0 ||
- (ret = ff_formats_ref(out, &ctx->outputs[0]->in_formats)) < 0)
+
+ if ((ret = ff_formats_ref(ff_make_format_list(in_fmts) , &ctx->inputs[0]->out_formats)) < 0)
+ return ret;
+ if ((ret = ff_formats_ref(ff_make_format_list(out_fmts), &ctx->outputs[0]->in_formats)) < 0)
return ret;
return 0;
}
--
GitLab