diff options
| author | Tim Walker <tdskywalker@gmail.com> | 2013-02-07 09:36:21 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-02-07 09:36:21 +0000 |
| commit | 08797c599df5371909f6924d732b654f8892cc91 (patch) | |
| tree | 6e9b2d79a789798b82b7cc9337aa3a460907bf18 /libavcodec/flacdec.c | |
| parent | d11ac64ecf03f7896ebc5e776e078fdc1f0543a4 (diff) | |
| download | ffmpeg-08797c599df5371909f6924d732b654f8892cc91.tar.gz | |
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.
Diffstat (limited to 'libavcodec/flacdec.c')
| -rw-r--r-- | libavcodec/flacdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |