diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-18 02:23:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-18 03:04:44 +0100 |
| commit | 1bdc212a39312bd5914d643a4e664b4599477d8c (patch) | |
| tree | 19fcd489c7ec86908e240f1d6f6752d587dc97e7 /libavcodec/mpegaudiodec.c | |
| parent | 1a2484fc4e5c5effc32c55c2f25670ec23cbf57b (diff) | |
| parent | 0ea5b44275aa334528eb384a6548cc9f98c50a17 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: link test programs with static libraries
dct-test: remove unused variable cropTbl
swscale: fix overflow in gray16 vertical scaling.
get_bits: remove LAST_SKIP_CACHE macro
swscale: fix integer overflows in RGB pixel writing.
swscale: add endian conversion for RGB555 and RGB444 pixel formats
swscale: fix overflows in output of RGB48 pixels.
get_bits: remove strange/obsolete comments
get_bits: whitespace (mostly) cosmetics
swscale: add rgb565 endianess conversion
get_bits: remove unnecessary #includes
mp3dec: hack: fix decoding with safe bitstream reader
fate: fix eatqi test
adpcm: Check for channels to be a non-zero integer
swscale: fix overflows in RGB rounding constants.
get_bits: introduce safe bitreading to prevent overreads.
Conflicts:
libswscale/swscale.c
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudiodec.c')
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 5cc3c74339..1bfccb427e 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -24,6 +24,8 @@ * MPEG Audio decoder */ +#define UNCHECKED_BITSTREAM_READER 1 + #include "libavutil/audioconvert.h" #include "avcodec.h" #include "get_bits.h" @@ -1434,6 +1436,9 @@ static int mp_decode_layer3(MPADecodeContext *s) memcpy(s->last_buf + s->last_buf_size, ptr, EXTRABYTES); s->in_gb = s->gb; init_get_bits(&s->gb, s->last_buf, s->last_buf_size*8); +#if CONFIG_SAFE_BITSTREAM_READER + s->gb.size_in_bits_plus8 += EXTRABYTES * 8; +#endif skip_bits_long(&s->gb, 8*(s->last_buf_size - main_data_begin)); } |