diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-08-22 12:36:12 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-09-02 13:10:38 +0200 |
| commit | 91d305790ea0f6fe0f54b48236da42181c39c18b (patch) | |
| tree | 1d1aca149505ea6c924101d0c82ffe81f4d78e5f | |
| parent | ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef (diff) | |
| download | ffmpeg-91d305790ea0f6fe0f54b48236da42181c39c18b.tar.gz | |
get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE
The HAVE_ prefix is reserved for macros set by configure.
| -rw-r--r-- | libavcodec/get_bits.h | 4 | ||||
| -rw-r--r-- | libavcodec/golomb.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 5a0089add8..f1962f29d5 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_AVAILABLE(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_AVAILABLE(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 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); } |