diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:54:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 15:52:39 +0100 |
| commit | fa36270c4c68589882cfeae68a037f1d191231c2 (patch) | |
| tree | 2ddefb2bbda1108755170cd97f514b75780da51a /libavcodec/mlp_parser.h | |
| parent | 8102f27b5b3dff54f8099019c2df4701ac5e5d4f (diff) | |
| parent | 99ccd2ba10eac2b282c272ad9e75f082123c765a (diff) | |
| download | ffmpeg-fa36270c4c68589882cfeae68a037f1d191231c2.tar.gz | |
Merge commit '99ccd2ba10eac2b282c272ad9e75f082123c765a'
* commit '99ccd2ba10eac2b282c272ad9e75f082123c765a':
mlp: store the channel layout for each substream.
Conflicts:
libavcodec/mlp_parser.c
libavcodec/mlpdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlp_parser.h')
| -rw-r--r-- | libavcodec/mlp_parser.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/mlp_parser.h b/libavcodec/mlp_parser.h index 6aafed5086..0415ccc7b0 100644 --- a/libavcodec/mlp_parser.h +++ b/libavcodec/mlp_parser.h @@ -39,9 +39,12 @@ typedef struct MLPHeaderInfo int group1_samplerate; ///< Sample rate of first substream int group2_samplerate; ///< Sample rate of second substream (MLP only) - int channels_mlp; ///< Channel arrangement for MLP streams - int channels_thd_stream1; ///< Channel arrangement for substream 1 of TrueHD streams (5.1) - int channels_thd_stream2; ///< Channel arrangement for substream 2 of TrueHD streams (7.1) + 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") + uint64_t channel_layout_mlp; ///< Channel layout for MLP streams + uint64_t channel_layout_thd_stream1; ///< Channel layout for substream 1 of TrueHD streams ("6-channel presentation") + uint64_t channel_layout_thd_stream2; ///< Channel layout for substream 2 of TrueHD streams ("8-channel presentation") int access_unit_size; ///< Number of samples per coded frame int access_unit_size_pow2; ///< Next power of two above number of samples per frame |