diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-02 22:18:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-02 22:18:12 +0200 |
| commit | 9e59a7be1cc9bd840d91f78c55b7f4953659319b (patch) | |
| tree | 161ab63e1dcaacffcd06fe7723591966586650a3 | |
| parent | c8be5258dec928119fab414341b13c0cf5405294 (diff) | |
| parent | 91d305790ea0f6fe0f54b48236da42181c39c18b (diff) | |
| download | ffmpeg-9e59a7be1cc9bd840d91f78c55b7f4953659319b.tar.gz | |
Merge commit '91d305790ea0f6fe0f54b48236da42181c39c18b'
* commit '91d305790ea0f6fe0f54b48236da42181c39c18b':
get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE
Conflicts:
libavcodec/golomb.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/get_bits.h | 4 | ||||
| -rw-r--r-- | libavcodec/golomb.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 90235e319b..02f850cee6 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -130,14 +130,14 @@ typedef struct RL_VLC_ELEM { unsigned int name ## _index = (gb)->index; \ unsigned int av_unused name ## _cache -#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 1c4e2106ee..81d8aeef9e 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -142,7 +142,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 (ret<0x8000000U && HAVE_BITS_REMAINING(re, gb)); + } while (ret<0x8000000U && BITS_AVAILABLE(re, gb)); CLOSE_READER(re, gb); return ret - 1; |