]> git.sesse.net Git - ffmpeg/commitdiff
lavfi/af_aresample: fix layout consistency check.
authorNicolas George <nicolas.george@normalesup.org>
Tue, 26 Feb 2013 19:11:47 +0000 (20:11 +0100)
committerNicolas George <nicolas.george@normalesup.org>
Thu, 28 Feb 2013 18:23:12 +0000 (19:23 +0100)
If the channel layout is unknown, lswr will internally use
the default one for the corresponding number of channels.

libavfilter/af_aresample.c

index 2e3867efda689bc15cf1fa689f40772eac92d742..ab3e7cf9e866ce0eeebb8ee38d04af5ecbdb465a 100644 (file)
@@ -160,7 +160,7 @@ static int config_output(AVFilterLink *outlink)
     outlink->time_base = (AVRational) {1, out_rate};
 
     av_assert0(outlink->sample_rate == out_rate);
-    av_assert0(outlink->channel_layout == out_layout);
+    av_assert0(outlink->channel_layout == out_layout || !outlink->channel_layout);
     av_assert0(outlink->format == out_format);
 
     aresample->ratio = (double)outlink->sample_rate / inlink->sample_rate;