From 9efcfbed9dd64679145f5f39d9a812dfeea97172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Thu, 14 Mar 2013 00:56:20 +0100 Subject: lavfi/ebur128: fix format negociation for output. Before this change, the audio input and output formats are set independently, so the lavfi negociation could pick different settings for the input and output. This is particularly true for the channel layout settings, where multiple choices were available. Fixes Ticket2342. --- libavfilter/f_ebur128.c | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'libavfilter/f_ebur128.c') diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c index 05ea63033f..acf29d5089 100644 --- a/libavfilter/f_ebur128.c +++ b/libavfilter/f_ebur128.c @@ -690,22 +690,6 @@ static int query_formats(AVFilterContext *ctx) outlink = ctx->outputs[1]; } - /* set audio output formats (same as input since it's just a passthrough) */ - formats = ff_make_format_list(sample_fmts); - if (!formats) - return AVERROR(ENOMEM); - ff_formats_ref(formats, &outlink->in_formats); - - layouts = ff_all_channel_layouts(); - if (!layouts) - return AVERROR(ENOMEM); - ff_channel_layouts_ref(layouts, &outlink->in_channel_layouts); - - formats = ff_make_format_list(input_srate); - if (!formats) - return AVERROR(ENOMEM); - ff_formats_ref(formats, &outlink->in_samplerates); - return 0; } -- cgit v1.2.3