From: Hendrik Leppkes <h.leppkes@gmail.com>
Date: Sun, 18 Dec 2011 14:25:25 +0000 (+0100)
Subject: mlpdec: fix channel order for wide 7.1 truehd layouts
X-Git-Tag: android-x86-4.4-r1~14361
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b9d8af03270223202c9a991655d3f75b5a8b56b5;p=android-x86%2Fexternal-ffmpeg.git

mlpdec: fix channel order for wide 7.1 truehd layouts
---

diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index e91295084c..339c75778d 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -476,7 +476,8 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
         }
     }
     if (m->avctx->codec_id == CODEC_ID_TRUEHD &&
-        m->avctx->channel_layout == AV_CH_LAYOUT_7POINT1) {
+        (m->avctx->channel_layout == AV_CH_LAYOUT_7POINT1 ||
+        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]);
     }