From fffa4530f92ea29594d4b39cf7c9922aa6a7bab3 Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Sat, 5 Nov 2011 22:07:22 +0100 Subject: Simplify using get_bits_left. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Reimar Döffinger --- libavcodec/rtjpeg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavcodec/rtjpeg.c') diff --git a/libavcodec/rtjpeg.c b/libavcodec/rtjpeg.c index 303183f230..1827c9111b 100644 --- a/libavcodec/rtjpeg.c +++ b/libavcodec/rtjpeg.c @@ -56,7 +56,7 @@ static inline int get_block(GetBitContext *gb, DCTELEM *block, const uint8_t *sc // number of non-zero coefficients coeff = get_bits(gb, 6); - if (get_bits_count(gb) + (coeff << 1) >= gb->size_in_bits) + if (get_bits_left(gb) < (coeff << 1)) return -1; // normally we would only need to clear the (63 - coeff) last values, @@ -73,7 +73,7 @@ static inline int get_block(GetBitContext *gb, DCTELEM *block, const uint8_t *sc // 4 bits per coefficient ALIGN(4); - if (get_bits_count(gb) + (coeff << 2) >= gb->size_in_bits) + if (get_bits_left(gb) < (coeff << 2)) return -1; while (coeff) { ac = get_sbits(gb, 4); @@ -84,7 +84,7 @@ static inline int get_block(GetBitContext *gb, DCTELEM *block, const uint8_t *sc // 8 bits per coefficient ALIGN(8); - if (get_bits_count(gb) + (coeff << 3) >= gb->size_in_bits) + if (get_bits_left(gb) < (coeff << 3)) return -1; while (coeff) { ac = get_sbits(gb, 8); -- cgit v1.2.3