[FFmpeg-cvslog] lavfi/avfiltergraph: do not reduce incompatible lists.
Nicolas George
git at videolan.org
Thu Nov 28 01:36:06 CET 2013
ffmpeg | branch: release/2.0 | Nicolas George <nicolas.george at normalesup.org> | Tue Sep 3 22:13:49 2013 +0200| [c2d37e736428d3daf9d0d0795af2815fd11dc432] | 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=c2d37e736428d3daf9d0d0795af2815fd11dc432
---
libavfilter/avfiltergraph.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 444a1a1..4ae108f 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -661,7 +661,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);
More information about the ffmpeg-cvslog
mailing list