From fe898a037d99108b3d2ca29bb1d69887566d278d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Thu, 14 Mar 2013 06:25:20 +0100 Subject: [PATCH] Revert "lavfi/ebur128: fix format negociation for output." This reverts commit 9efcfbed9dd64679145f5f39d9a812dfeea97172. All the shame on me; this commit is actually causing more problems (broken outputs but also crashes) than it was solving. --- libavfilter/f_ebur128.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c index acf29d5089..05ea63033f 100644 --- a/libavfilter/f_ebur128.c +++ b/libavfilter/f_ebur128.c @@ -690,6 +690,22 @@ 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; }