Module: libav Branch: master Commit: 7fb55e0b02385ae0905af73a52c3db87d08777da
Author: Reimar Döffinger <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Sat Nov 5 22:07:22 2011 +0100 rtjpeg: simplify get_block() by using get_bits_left. Signed-off-by: Reimar Döffinger <[email protected]> Signed-off-by: Anton Khirnov <[email protected]> --- libavcodec/rtjpeg.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/rtjpeg.c b/libavcodec/rtjpeg.c index dac7993..35ab090 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); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
