From 291d464161a5bf3b566bc147f83e4242b0c18d74 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 24 Apr 2014 01:25:46 +0200
Subject: [PATCH] swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input
Fixes Ticket 3542
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libswresample/rematrix.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index e146edfcf7d..bf2abcfb20e 100644
--- a/libswresample/rematrix.c
+++ b/libswresample/rematrix.c
@@ -127,6 +127,11 @@ av_cold static int auto_matrix(SwrContext *s)
)
out_ch_layout = AV_CH_LAYOUT_STEREO;
+ if( in_ch_layout == AV_CH_LAYOUT_STEREO_DOWNMIX
+ && (out_ch_layout & AV_CH_LAYOUT_STEREO_DOWNMIX) == 0
+ )
+ in_ch_layout = AV_CH_LAYOUT_STEREO;
+
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);
--
GitLab