From 7f16ec61e17ddc039e68637f1ca27844718312a6 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Sun, 16 Oct 2011 17:12:53 +0200
Subject: [PATCH] Do not warn about wrong channel layout if no channel layout
is defined.
---
libswresample/swresample.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index c0a1893cabc..584c74b6d98 100644
--- 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;
}
--
GitLab