From 1af0ace3a4b8aa8c6240a99de3c40f495ab279e9 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 18 Dec 2011 15:28:18 +0100 Subject: [PATCH] Fix channel order for some less common TrueHD layouts. Reported and tested by TDiTP_ Fixes ticket #779. --- libavcodec/mlpdec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 339c75778d..47aee286ff 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -480,6 +480,14 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, m->avctx->channel_layout == AV_CH_LAYOUT_7POINT1_WIDE)) { FFSWAP(int, s->ch_assign[4], s->ch_assign[6]); FFSWAP(int, s->ch_assign[5], s->ch_assign[7]); + } else if (m->avctx->codec_id == CODEC_ID_TRUEHD && + (m->avctx->channel_layout == AV_CH_LAYOUT_6POINT1 || + m->avctx->channel_layout == (AV_CH_LAYOUT_6POINT1 | AV_CH_TOP_CENTER) || + m->avctx->channel_layout == (AV_CH_LAYOUT_6POINT1 | AV_CH_TOP_FRONT_CENTER))) { + int i = s->ch_assign[6]; + s->ch_assign[6] = s->ch_assign[5]; + s->ch_assign[5] = s->ch_assign[4]; + s->ch_assign[4] = i; } checksum = ff_mlp_restart_checksum(buf, get_bits_count(gbp) - start_count); -- 2.11.0