mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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.
This commit is contained in:
parent
d11ac64ecf
commit
08797c599d
@ -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);
|
||||
}
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user