From 39867f3e098ab304cd3bef0ace19d73617cdb817 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 21 Jul 2015 17:40:38 +0200 Subject: avfilter/af_channelmap: Move ff_add_channel_layout() call to querry_format() Avoids memleak if querry_formats is not called Signed-off-by: Michael Niedermayer --- libavfilter/af_channelmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libavfilter/af_channelmap.c') diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index f8289ccf5e..06931456fb 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -275,8 +275,6 @@ static av_cold int channelmap_init(AVFilterContext *ctx) return AVERROR(EINVAL); } - ff_add_channel_layout(&s->channel_layouts, s->output_layout); - if (mode == MAP_PAIR_INT_STR || mode == MAP_PAIR_STR_STR) { for (i = 0; i < s->nch; i++) { s->map[i].out_channel_idx = av_get_channel_layout_channel_index( @@ -299,6 +297,7 @@ static int channelmap_query_formats(AVFilterContext *ctx) if (!layouts) return AVERROR(ENOMEM); + ff_add_channel_layout(&s->channel_layouts, s->output_layout); ff_channel_layouts_ref(layouts, &ctx->inputs[0]->out_channel_layouts); ff_channel_layouts_ref(s->channel_layouts, &ctx->outputs[0]->in_channel_layouts); -- cgit v1.2.3