The HAVE_ prefix is reserved for macros set by configure.
---
libavcodec/get_bits.h | 4 ++--
libavcodec/golomb.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h
index 5a0089a..78a4c23 100644
--- a/libavcodec/get_bits.h
+++ b/libavcodec/get_bits.h
@@ -128,14 +128,14 @@ typedef struct RL_VLC_ELEM {
unsigned int name ## _index = (gb)->index; \
unsigned int av_unused name ## _cache = 0
-#define HAVE_BITS_REMAINING(name, gb) 1
+#define BITS_ARE_REMAINING(name, gb) 1
#else
#define OPEN_READER(name, gb) \
unsigned int name ## _index = (gb)->index; \
unsigned int av_unused name ## _cache = 0; \
unsigned int av_unused name ## _size_plus8 = (gb)->size_in_bits_plus8
-#define HAVE_BITS_REMAINING(name, gb) name ## _index < name ## _size_plus8
+#define BITS_ARE_REMAINING(name, gb) name ## _index < name ## _size_plus8
#endif
#define CLOSE_READER(name, gb) (gb)->index = name ## _index
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index 1754706..699b897 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_ARE_REMAINING(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_ARE_REMAINING(re, gb); i++) {
LAST_SKIP_BITS(re, gb, 1);
UPDATE_CACHE(re, gb);
}
--
1.9.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
