Michael Niedermayer b4107f7805 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>

2014-01-05 22:53:13 +01:00

3.1 KiB

Raw Blame History

View Raw