swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input

Fixes Ticket 3542 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 291d464161
parent 417ae6281b
commit 291d464161
1 changed files with 5 additions and 0 deletions
--- 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);