Merge commit '5af78cc98d807f3b43510410dad46e1840c5c99f' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Feb 2013 11:03:59 +0000 (12:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Feb 2013 11:03:59 +0000 (12:03 +0100)
commit6baaaa0174bf2eb58016c3ac6b02fe2e5a8b1089
treec6c5c55e65fafcdba6971975ff9e4f84323a9cd2
parent9e3e11a348e047da05415c3e7ea6720be2d78d9f
parent5af78cc98d807f3b43510410dad46e1840c5c99f
Merge commit '5af78cc98d807f3b43510410dad46e1840c5c99f' into release/1.1

* commit '5af78cc98d807f3b43510410dad46e1840c5c99f':
  mlp: store the channel layout for each substream.
  mlpdec: TrueHD: use Libav channel order.
  mlpdec: set the channel layout.
  x86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly

Conflicts:
libavcodec/mlp_parser.c
libavcodec/mlpdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mlpdec.c