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/eac3dec.c | |
| 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/eac3dec.c')
| -rw-r--r-- | libavcodec/eac3dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c index 52d15c83f8..40f571ffc7 100644 --- a/libavcodec/eac3dec.c +++ b/libavcodec/eac3dec.c @@ -410,7 +410,7 @@ int ff_eac3_parse_header(AC3DecodeContext *s) /* informational metadata */ if (get_bits1(gbc)) { - skip_bits(gbc, 3); // skip bit stream mode + s->bitstream_mode = get_bits(gbc, 3); skip_bits(gbc, 2); // skip copyright bit and original bitstream bit if (s->channel_mode == AC3_CHMODE_STEREO) { skip_bits(gbc, 4); // skip Dolby surround and headphone mode |