diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-26 02:42:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-26 03:06:30 +0100 |
| commit | 27ef7b1bcd0577e3f5bdfc524b42b0548567be20 (patch) | |
| tree | dbb243f25cf614d4951ce9352c89befb3526ed23 /libavcodec/ac3.h | |
| parent | 0bfe349d4a3e2a98c6f4f02fb03d8585e531d850 (diff) | |
| parent | eb81cf860cbb23ece082e6a463a2c6ced8c55ead (diff) | |
| download | ffmpeg-27ef7b1bcd0577e3f5bdfc524b42b0548567be20.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder.
Use audio_service_type to set stream disposition.
Add APIchanges entry for audio_service_type.
Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream.
configure: in check_ld, place new -l flags before existing ones
support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl
doc: update build system documentation
aacenc: indentation
aacenc: fix the side calculation in search_for_ms
vp8.c: rename EDGE_* to VP8_EDGE_*.
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavcodec/vp8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3.h')
| -rw-r--r-- | libavcodec/ac3.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h index 5e0b2621aa..1a8cce9a6d 100644 --- a/libavcodec/ac3.h +++ b/libavcodec/ac3.h @@ -87,6 +87,7 @@ typedef struct { uint16_t crc1; uint8_t sr_code; uint8_t bitstream_id; + uint8_t bitstream_mode; uint8_t channel_mode; uint8_t lfe_on; uint8_t frame_type; |