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/flac_parser.c | |
| parent | d11ac64ecf03f7896ebc5e776e078fdc1f0543a4 (diff) | |
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/flac_parser.c')
| -rw-r--r-- | libavcodec/flac_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c index 52ec1ee683..e2c6744d78 100644 --- a/libavcodec/flac_parser.c +++ b/libavcodec/flac_parser.c @@ -458,7 +458,7 @@ static int get_best_header(FLACParseContext* fpc, const uint8_t **poutbuf, } if (header->fi.channels != fpc->avctx->channels || - (!fpc->avctx->channel_layout && header->fi.channels <= 6)) { + !fpc->avctx->channel_layout) { fpc->avctx->channels = header->fi.channels; ff_flac_set_channel_layout(fpc->avctx); } |