Browse Source

swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input

Fixes Ticket 3542

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.3
Michael Niedermayer 11 years ago
parent
commit
291d464161
1 changed files with 5 additions and 0 deletions
  1. +5
    -0
      libswresample/rematrix.c

+ 5
- 0
libswresample/rematrix.c View File

@@ -127,6 +127,11 @@ av_cold static int auto_matrix(SwrContext *s)
) )
out_ch_layout = AV_CH_LAYOUT_STEREO; 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)){ if(!sane_layout(in_ch_layout)){
av_get_channel_layout_string(buf, sizeof(buf), -1, s->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); av_log(s, AV_LOG_ERROR, "Input channel layout '%s' is not supported\n", buf);


Loading…
Cancel
Save