diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 22:53:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 22:53:13 +0100 |
| commit | b4107f7805be6699d4b38449b1f9235958a2a133 (patch) | |
| tree | a0403f61442e8d2dff1d66c5577d8cfae861f30e /libavcodec/lcl.h | |
| parent | ae01af24756d6f5bd13eef405ca19a8bf458b39f (diff) | |
| parent | 4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09 (diff) | |
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>
Diffstat (limited to 'libavcodec/lcl.h')
0 files changed, 0 insertions, 0 deletions