diff options
Diffstat (limited to 'libavcodec/flacdec.c')
| -rw-r--r-- | libavcodec/flacdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index d555ddfc2e..9d5ecd04cf 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -424,7 +424,8 @@ static int decode_frame(FLACContext *s) return ret; } s->channels = s->avctx->channels = fi.channels; - ff_flac_set_channel_layout(s->avctx); + if (!s->avctx->channel_layout && s->channels <= 6) + ff_flac_set_channel_layout(s->avctx); s->ch_mode = fi.ch_mode; if (!s->bps && !fi.bps) { |