summaryrefslogtreecommitdiff
path: root/libavcodec/golomb.h
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-08-22 12:36:12 +0200
committerDiego Biurrun <diego@biurrun.de>2014-09-02 13:10:38 +0200
commit91d305790ea0f6fe0f54b48236da42181c39c18b (patch)
tree1d1aca149505ea6c924101d0c82ffe81f4d78e5f /libavcodec/golomb.h
parentff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef (diff)
downloadffmpeg-91d305790ea0f6fe0f54b48236da42181c39c18b.tar.gz
get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE
The HAVE_ prefix is reserved for macros set by configure.
Diffstat (limited to 'libavcodec/golomb.h')
-rw-r--r--libavcodec/golomb.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index 1754706077..22a87c64e1 100644
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@@ -138,7 +138,7 @@ static inline unsigned svq3_get_ue_golomb(GetBitContext *gb)
ret = (ret << 4) | ff_interleaved_dirac_golomb_vlc_code[buf];
UPDATE_CACHE(re, gb);
buf = GET_CACHE(re, gb);
- } while (HAVE_BITS_REMAINING(re, gb));
+ } while (BITS_AVAILABLE(re, gb));
CLOSE_READER(re, gb);
return ret - 1;
@@ -328,7 +328,7 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit,
return buf;
} else {
int i;
- for (i = 0; i < limit && SHOW_UBITS(re, gb, 1) == 0 && HAVE_BITS_REMAINING(re, gb); i++) {
+ for (i = 0; i < limit && SHOW_UBITS(re, gb, 1) == 0 && BITS_AVAILABLE(re, gb); i++) {
LAST_SKIP_BITS(re, gb, 1);
UPDATE_CACHE(re, gb);
}