diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-18 01:46:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-18 02:09:17 +0100 |
| commit | 1a2484fc4e5c5effc32c55c2f25670ec23cbf57b (patch) | |
| tree | b3db7f3ea1b49accd4f1db23fb7ff1c3938def3b /libavcodec/proresdec2.c | |
| parent | 53509d20cac1f9c4bb7e746f36e25d6fc66ae31b (diff) | |
| download | ffmpeg-1a2484fc4e5c5effc32c55c2f25670ec23cbf57b.tar.gz | |
get_bits: drop the a32 reader.
that way qatar maintains the code for me and i dont need to resolve conflicts.
If someone wants the a32 reader back, only thing you need to do is maintain
it, i would be happy to have it back, iam just not volunteering to maintain
it due to lack of time.
Based on: a1e98f198e9db4e5ddfc2f777014179d3d7bc4d2 by Mans Rullgard.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresdec2.c')
| -rw-r--r-- | libavcodec/proresdec2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 7f940d2788..aad7b54056 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -26,7 +26,7 @@ //#define DEBUG -#define A32_BITSTREAM_READER +#define LONG_BITSTREAM_READER #include "avcodec.h" #include "get_bits.h" @@ -333,7 +333,7 @@ static av_always_inline void decode_ac_coeffs(AVCodecContext *avctx, GetBitConte block_mask = blocks_per_slice - 1; for (pos = block_mask;;) { - bits_left = gb->size_in_bits - (((uint8_t*)re_buffer_ptr - gb->buffer)*8 - 32 + re_bit_count); + bits_left = gb->size_in_bits - re_index; if (!bits_left || (bits_left < 32 && !SHOW_UBITS(re, gb, bits_left))) break; |