Do not warn about wrong channel layout if no channel layout is defined.

13 years ago · 7f16ec61e1
parent 55d44578c6
commit 7f16ec61e1
1 changed files with 1 additions and 1 deletions
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@ -166,7 +166,7 @@ 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)){
+    if(s-> in.ch_count && s-> in_ch_layout && 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;
    }