From 4a640a6ac89099bfb02d6d3d3ada04e321a37476 Mon Sep 17 00:00:00 2001
From: Nicolas George <george@nsup.org>
Date: Fri, 25 Oct 2013 16:11:30 +0200
Subject: [PATCH] lswr: fix assert failure on unknown layouts.
---
libswresample/rematrix.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index 5c98e68990f..e146edfcf7d 100644
--- a/libswresample/rematrix.c
+++ b/libswresample/rematrix.c
@@ -433,8 +433,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]){
--
GitLab