From 08797c599df5371909f6924d732b654f8892cc91 Mon Sep 17 00:00:00 2001 From: Tim Walker Date: Thu, 7 Feb 2013 09:36:21 +0000 Subject: flac: don't check the number of channels before setting the channel layout This is unnecessary, as ff_flac_set_channel_layout can handle any number of channels. --- libavcodec/flacdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/flacdec.c') diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 0e887e6f89..56249729bf 100644 --- 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; -- cgit v1.2.3