diff options
| author | Tim Walker <tdskywalker@gmail.com> | 2013-01-22 21:53:53 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-02-06 21:43:05 +0100 |
| commit | 41244e13d5452e70cfd42f76ede4a20b7081c71f (patch) | |
| tree | 23c12c3283721fa909a3458954e74e77f5956c3b | |
| parent | a846dccb29d2bb0798af1d47d06100eda9ca87cc (diff) | |
| download | ffmpeg-41244e13d5452e70cfd42f76ede4a20b7081c71f.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.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/flac_parser.c | 2 | ||||
| -rw-r--r-- | libavcodec/flacdec.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c index 3d8e17f995..ee92ee3b0d 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); } diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 51fd19628c..f273d145cb 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -426,7 +426,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; |