diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-24 01:25:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 15:14:40 +0200 |
| commit | 6b0c1ed11608d7b91606d23331808795dcfa91b3 (patch) | |
| tree | f4bf38290273f5fa04a05d68e82420cfae9b3061 | |
| parent | acba4d1e55e0eb104abe78716194a8d06cb8b4bd (diff) | |
| download | ffmpeg-6b0c1ed11608d7b91606d23331808795dcfa91b3.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)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 c126565145..0d568afdbe 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -147,6 +147,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); |