From d300f5f6f570659e4b58567b35c9e8600c9f2956 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Tue, 3 Sep 2013 22:13:49 +0200 Subject: [PATCH] lavfi/avfiltergraph: do not reduce incompatible lists. A list of "all channel layouts" but not "all channel counts" can not be reduced to a single unknown channel count. --- libavfilter/avfiltergraph.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index bcdcde06ce4..1fb83c48778 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -741,7 +741,8 @@ static int reduce_formats_on_filter(AVFilterContext *filter) if (inlink->type != outlink->type || fmts->nb_channel_layouts == 1) continue; - if (fmts->all_layouts) { + if (fmts->all_layouts && + (!FF_LAYOUT2COUNT(fmt) || fmts->all_counts)) { /* Turn the infinite list into a singleton */ fmts->all_layouts = fmts->all_counts = 0; ff_add_channel_layout(&outlink->in_channel_layouts, fmt); -- 2.39.5