diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-24 01:25:46 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-04-24 09:02:34 +0200 |
| commit | 8d6de877094f144a8b15df69a5e74c2072b799bc (patch) | |
| tree | 269d0c0d55712b6f36e1a2eb00094bd357b0468f | |
| parent | af04f0d1ce70e265ac1c51fed954668410f211c9 (diff) | |
| download | ffmpeg-8d6de877094f144a8b15df69a5e74c2072b799bc.tar.gz | |
swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input
Fixes Ticket 3542
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 291d464161a5bf3b566bc147f83e4242b0c18d74)
| -rw-r--r-- | libswresample/rematrix.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index e146edfcf7..bf2abcfb20 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); |