diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 23:06:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 23:06:53 +0100 |
| commit | 7b3c78b5e6ded82ea9f264806bf4e3068f37f4cf (patch) | |
| tree | 5ed6d41054f6f658b6796078603d10bef1e58d4c /libavcodec/ac3dec.h | |
| parent | 85b424a45e3846bf48b8e53bc107bb4ead8216c6 (diff) | |
| parent | 13345fc1f86fc3615789e196d5a339c1c27c9068 (diff) | |
| download | ffmpeg-7b3c78b5e6ded82ea9f264806bf4e3068f37f4cf.tar.gz | |
Merge commit '13345fc1f86fc3615789e196d5a339c1c27c9068'
* commit '13345fc1f86fc3615789e196d5a339c1c27c9068':
(e)ac3: parse and store the Dolby Surround, Surround EX and Headphone mode flags.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3dec.h')
| -rw-r--r-- | libavcodec/ac3dec.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h index fa447c4d6f..fe9d9bc40f 100644 --- a/libavcodec/ac3dec.h +++ b/libavcodec/ac3dec.h @@ -79,6 +79,7 @@ typedef struct AC3DecodeContext { int bit_rate; ///< stream bit rate, in bits-per-second int sample_rate; ///< sample frequency, in Hz int num_blocks; ///< number of audio blocks + int bitstream_id; ///< bitstream id (bsid) int bitstream_mode; ///< bitstream mode (bsmod) int channel_mode; ///< channel mode (acmod) int lfe_on; ///< lfe channel in use @@ -86,6 +87,9 @@ typedef struct AC3DecodeContext { int center_mix_level; ///< Center mix level index int surround_mix_level; ///< Surround mix level index int eac3; ///< indicates if current frame is E-AC-3 + int dolby_surround_mode; ///< dolby surround mode (dsurmod) + int dolby_surround_ex_mode; ///< dolby surround ex mode (dsurexmod) + int dolby_headphone_mode; ///< dolby headphone mode (dheadphonmod) ///@} int preferred_stereo_downmix; |