From 6dfffe92004dfd8c79d18791f28a2b1c7e387845 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 20 Aug 2013 16:49:31 +0200 Subject: [PATCH] swr: clean layouts before checking sanity Signed-off-by: Michael Niedermayer --- libswresample/rematrix.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index f13c240feb..f15cf712c0 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -123,13 +123,14 @@ av_cold static int auto_matrix(SwrContext *s) float maxval; in_ch_layout = clean_layout(s, s->in_ch_layout); + out_ch_layout = clean_layout(s, s->out_ch_layout); + if(!sane_layout(in_ch_layout)){ av_get_channel_layout_string(buf, sizeof(buf), -1, s->in_ch_layout); av_log(s, AV_LOG_ERROR, "Input channel layout '%s' is not supported\n", buf); return AVERROR(EINVAL); } - out_ch_layout = clean_layout(s, s->out_ch_layout); if(!sane_layout(out_ch_layout)){ av_get_channel_layout_string(buf, sizeof(buf), -1, s->out_ch_layout); av_log(s, AV_LOG_ERROR, "Output channel layout '%s' is not supported\n", buf);