[FFmpeg-cvslog] lavfi/avfiltergraph: do not reduce incompatible lists.

[Nicolas George]

ffmpeg | branch: release/2.1 | Nicolas George <nicolas.george at normalesup.org> | Tue Sep  3 22:13:49 2013 +0200| [1a676881caad21a3b038206e1d596ca2b241c4a3] | committer: Carl Eugen Hoyos

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.
(cherry picked from commit d300f5f6f570659e4b58567b35c9e8600c9f2956)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a676881caad21a3b038206e1d596ca2b241c4a3
---

 libavfilter/avfiltergraph.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index bcdcde0..1fb83c4 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);