[FFmpeg-cvslog] Merge commit '5af78cc98d807f3b43510410dad46e1840c5c99f' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 14 12:03:59 2013 +0100| [6baaaa0174bf2eb58016c3ac6b02fe2e5a8b1089] | committer: Michael Niedermayer

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 at gmx.at>

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