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/mlp.h | |
| parent | ae01af24756d6f5bd13eef405ca19a8bf458b39f (diff) | |
| parent | 4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09 (diff) | |
| download | ffmpeg-b4107f7805be6699d4b38449b1f9235958a2a133.tar.gz | |
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/mlp.h')
| -rw-r--r-- | libavcodec/mlp.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/mlp.h b/libavcodec/mlp.h index d8d1292903..bb9ca26aa8 100644 --- a/libavcodec/mlp.h +++ b/libavcodec/mlp.h @@ -124,4 +124,14 @@ static inline uint8_t xor_32_to_8(uint32_t value) return value; } +typedef enum THDChannelModifier { + THD_CH_MODIFIER_NOTINDICATED = 0x0, + THD_CH_MODIFIER_STEREO = 0x0, // Stereo (not Dolby Surround) + THD_CH_MODIFIER_LTRT = 0x1, // Dolby Surround + THD_CH_MODIFIER_LBINRBIN = 0x2, // Dolby Headphone + THD_CH_MODIFIER_MONO = 0x3, // Mono or Dual Mono + THD_CH_MODIFIER_NOTSURROUNDEX = 0x1, // Not Dolby Digital EX + THD_CH_MODIFIER_SURROUNDEX = 0x2, // Dolby Digital EX +} THDChannelModifier; + #endif /* AVCODEC_MLP_H */ |