From 67b2df792fed29b806cc94213dbd6558d8e717df Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 6 Oct 2011 19:17:38 +0200 Subject: [PATCH] swresample: Try to handle cases with input channel count and layout mismatching. Signed-off-by: Michael Niedermayer --- libswresample/swresample.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 65591f3a32..c7b206e14c 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -177,6 +177,11 @@ int swr_init(SwrContext *s){ return -1; } + if(s-> in.ch_count && s->in.ch_count != av_get_channel_layout_nb_channels(s-> in_ch_layout)){ + av_log(s, AV_LOG_WARNING, "Input channel layout has a different number of channels than there actually is, ignoring layout\n"); + s-> in_ch_layout= 0; + } + if(!s-> in_ch_layout) s-> in_ch_layout= guess_layout(s->in.ch_count); if(!s->out_ch_layout)