Merge commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 21:53:13 +0000 (22:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 21:53:13 +0000 (22:53 +0100)
commitb4107f7805be6699d4b38449b1f9235958a2a133
treea0403f61442e8d2dff1d66c5577d8cfae861f30e
parentae01af24756d6f5bd13eef405ca19a8bf458b39f
parent4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09
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@gmx.at>
libavcodec/mlp.h
libavcodec/mlp_parser.c
libavcodec/mlp_parser.h
libavcodec/mlpdec.c