mirror of https://git.ffmpeg.org/ffmpeg.git
avfilter/af_channelmap: Reorder operations to avoid memleak
Fixes CID1322346 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
59361d8c9d
commit
f5a6a8336f
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in New Issue