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.
This commit is contained in:
Nicolas George 2013-09-03 22:13:49 +02:00 committed by Nicolas George
parent f775eb3fb4
commit d300f5f6f5

View File

@ -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);