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_parser.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/mlp_parser.h')
| -rw-r--r-- | libavcodec/mlp_parser.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/mlp_parser.h b/libavcodec/mlp_parser.h index 9967abbad2..5d1d2e7845 100644 --- a/libavcodec/mlp_parser.h +++ b/libavcodec/mlp_parser.h @@ -40,6 +40,11 @@ typedef struct MLPHeaderInfo int group2_samplerate; ///< Sample rate of second substream (MLP only) int channel_arrangement; + + int channel_modifier_thd_stream0; ///< Channel modifier for substream 0 of TrueHD sreams ("2-channel presentation") + int channel_modifier_thd_stream1; ///< Channel modifier for substream 1 of TrueHD sreams ("6-channel presentation") + int channel_modifier_thd_stream2; ///< Channel modifier for substream 2 of TrueHD sreams ("8-channel presentation") + int channels_mlp; ///< Channel count for MLP streams int channels_thd_stream1; ///< Channel count for substream 1 of TrueHD streams ("6-channel presentation") int channels_thd_stream2; ///< Channel count for substream 2 of TrueHD streams ("8-channel presentation") |