diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-11-05 22:07:22 +0100 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-11-05 23:25:20 +0100 |
| commit | fffa4530f92ea29594d4b39cf7c9922aa6a7bab3 (patch) | |
| tree | a10001f04ae2d85817242ac222e969125181c306 /libavcodec/rtjpeg.c | |
| parent | b9242fd12f4be4a79e31fd0aa125ab8a48226896 (diff) | |
| download | ffmpeg-fffa4530f92ea29594d4b39cf7c9922aa6a7bab3.tar.gz | |
Simplify using get_bits_left.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'libavcodec/rtjpeg.c')
| -rw-r--r-- | libavcodec/rtjpeg.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |