Module: libav
Branch: master
Commit: 19c5fa9eea47d45b5eedce3bff4edeaf83fb3942
Author: Luca Barbato <lu_z...@gentoo.org>
Committer: Luca Barbato <lu_z...@gentoo.org>
Date: Tue Apr 11 12:11:59 2017 +0200
golomb: Simplify get_ur_golomb_jpegls
The loop always consumes the bit read and the new bitstream reader
can read 0 bits just fine.
---
libavcodec/golomb.h | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index 648f924..cff7e42 100644
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@@ -290,16 +290,12 @@ static inline int get_ur_golomb_jpegls(BitstreamContext
*bc, int k, int limit,
return buf;
} else {
int i;
- for (i = 0; i < limit && bitstream_peek(bc, 1) == 0 &&
bitstream_bits_left(bc) > 0; i++)
- bitstream_skip(bc, 1);
- bitstream_skip(bc, 1);
+ for (i = 0;
+ i < limit && bitstream_read_bit(bc) == 0 &&
bitstream_bits_left(bc) > 0;
+ i++);
if (i < limit - 1) {
- if (k) {
- buf = bitstream_read(bc, k);
- } else {
- buf = 0;
- }
+ buf = bitstream_read(bc, k);
return buf + (i << k);
} else if (i == limit - 1) {
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
