diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2011-12-18 15:25:25 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-01-03 14:05:21 +0100 |
| commit | a46fa584c5290817b12f472f77f8343c2f9bfc1c (patch) | |
| tree | 78b2459ffb77d7a84ab1621e21d53a72a5a0ed4e | |
| parent | 980e4263bc7a91af2b3a8afbbd41d261292d1b35 (diff) | |
| download | ffmpeg-a46fa584c5290817b12f472f77f8343c2f9bfc1c.tar.gz | |
mlpdec: fix channel order for wide 7.1 truehd layouts
(cherry picked from commit b9d8af03270223202c9a991655d3f75b5a8b56b5)
| -rw-r--r-- | libavcodec/mlpdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
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]); } |