diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-10-16 17:12:53 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-10-16 17:12:53 +0200 |
| commit | 7f16ec61e17ddc039e68637f1ca27844718312a6 (patch) | |
| tree | c2af1971db99c4fdb0638db926b7fc0487de490f | |
| parent | 55d44578c61ccd8b7db50e26e01196476ea530f3 (diff) | |
| download | ffmpeg-7f16ec61e17ddc039e68637f1ca27844718312a6.tar.gz | |
Do not warn about wrong channel layout if no channel layout is defined.
| -rw-r--r-- | libswresample/swresample.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |