[FFmpeg-cvslog] Merge commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan  5 22:53:13 2014 +0100| [b4107f7805be6699d4b38449b1f9235958a2a133] | committer: Michael Niedermayer

Merge commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09'

* commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09':
  mlp: Parse TrueHD decoder channel modifiers and set the AVMatrixEncoding for each substream.

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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