Merge commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a'

[ffmpeg] / libavcodec / flacdec.c

diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 0e887e6f89f9880cfedbaaa90e3504bb7b9a1953..56249729bfe7e9ab61af77b38988763edcad400c 100644 (file)
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -424,7 +424,7 @@ static int decode_frame(FLACContext *s)
             return ret;
     }
     s->channels = s->avctx->channels = fi.channels;
-    if (!s->avctx->channel_layout && s->channels <= 6)
+    if (!s->avctx->channel_layout)
         ff_flac_set_channel_layout(s->avctx);
     s->ch_mode = fi.ch_mode;