From f5a6a8336fa21dc6d6b6a9a07fa15f8f2240a840 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 4 Sep 2015 00:10:41 +0200 Subject: [PATCH] avfilter/af_channelmap: Reorder operations to avoid memleak Fixes CID1322346 Signed-off-by: Michael Niedermayer --- libavfilter/af_channelmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index dae79c14b6..37b47b2d7b 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -290,15 +290,15 @@ static int channelmap_query_formats(AVFilterContext *ctx) AVFilterChannelLayouts *layouts; AVFilterChannelLayouts *channel_layouts = NULL; + layouts = ff_all_channel_layouts(); + if (!layouts) + return AVERROR(ENOMEM); + ff_add_channel_layout(&channel_layouts, s->output_layout); ff_set_common_formats(ctx, ff_planar_sample_fmts()); ff_set_common_samplerates(ctx, ff_all_samplerates()); - layouts = ff_all_channel_layouts(); - if (!layouts) - return AVERROR(ENOMEM); - ff_channel_layouts_ref(layouts, &ctx->inputs[0]->out_channel_layouts); ff_channel_layouts_ref(channel_layouts, &ctx->outputs[0]->in_channel_layouts);