[FFmpeg-cvslog] Do not warn about wrong channel layout if no channel layout is defined.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun Oct 16 17:12:53 2011 +0200| [7f16ec61e17ddc039e68637f1ca27844718312a6] | committer: Carl Eugen Hoyos

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f16ec61e17ddc039e68637f1ca27844718312a6
---

 libswresample/swresample.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index c0a1893..584c74b 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;
     }