[FFmpeg-cvslog] mlpdec: fix channel order for wide 7.1 truehd layouts

[Hendrik Leppkes]

ffmpeg | branch: release/0.9 | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Dec 18 15:25:25 2011 +0100| [a46fa584c5290817b12f472f77f8343c2f9bfc1c] | committer: Carl Eugen Hoyos

mlpdec: fix channel order for wide 7.1 truehd layouts
(cherry picked from commit b9d8af03270223202c9a991655d3f75b5a8b56b5)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a46fa584c5290817b12f472f77f8343c2f9bfc1c
---

 libavcodec/mlpdec.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index e912950..339c757 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]);
     }