[FFmpeg-cvslog] lswr: fix assert failure on unknown layouts.

[Nicolas George]

ffmpeg | branch: release/2.0 | Nicolas George <george at nsup.org> | Fri Oct 25 16:11:30 2013 +0200| [02c8c064ea285c39dede64ad5cbad0dc5ad66c6d] | committer: Carl Eugen Hoyos

lswr: fix assert failure on unknown layouts.
(cherry picked from commit 4a640a6ac89099bfb02d6d3d3ada04e321a37476)

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

 libswresample/rematrix.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index 2ebe397..44ad792 100644
--- a/libswresample/rematrix.c
+++ b/libswresample/rematrix.c
@@ -424,8 +424,8 @@ int swri_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int mus
         off = len1 * out->bps;
     }
 
-    av_assert0(out->ch_count == av_get_channel_layout_nb_channels(s->out_ch_layout));
-    av_assert0(in ->ch_count == av_get_channel_layout_nb_channels(s-> in_ch_layout));
+    av_assert0(!s->out_ch_layout || out->ch_count == av_get_channel_layout_nb_channels(s->out_ch_layout));
+    av_assert0(!s-> in_ch_layout || in ->ch_count == av_get_channel_layout_nb_channels(s-> in_ch_layout));
 
     for(out_i=0; out_i<out->ch_count; out_i++){
         switch(s->matrix_ch[out_i][0]){