From: Carl Eugen Hoyos Date: Sun, 16 Oct 2011 15:12:53 +0000 (+0200) Subject: Do not warn about wrong channel layout if no channel layout is defined. X-Git-Tag: n0.9~1045 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=7f16ec61e17ddc039e68637f1ca27844718312a6 Do not warn about wrong channel layout if no channel layout is defined. --- diff --git a/libswresample/swresample.c b/libswresample/swresample.c index c0a1893cab..584c74b6d9 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; }