[FFmpeg-cvslog] lavfi/af_aresample: fix layout consistency check.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Tue Feb 26 20:11:47 2013 +0100| [2bd104c72a108f4f6291f0d0165f2d43ca115a98] | committer: Nicolas George

lavfi/af_aresample: fix layout consistency check.

If the channel layout is unknown, lswr will internally use
the default one for the corresponding number of channels.

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

 libavfilter/af_aresample.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c
index 2e3867e..ab3e7cf 100644
--- a/libavfilter/af_aresample.c
+++ b/libavfilter/af_aresample.c
@@ -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;