virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE

Browse Source 
The HAVE_ prefix is reserved for macros set by configure.
This commit is contained in:
Diego Biurrun 2014-08-22 12:36:12 +02:00
parent ff4d1aa8bc
commit 91d305790e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/get_bits.h
View File

@ -128,14 +128,14 @@ typedef struct RL_VLC_ELEM {
unsigned int name ## _index = (gb)->index; \ unsigned int name ## _index = (gb)->index; \
unsigned int av_unused name ## _cache = 0 unsigned int av_unused name ## _cache = 0
#define HAVE_BITS_REMAINING(name, gb) 1 #define BITS_AVAILABLE(name, gb) 1
#else #else
#define OPEN_READER(name, gb) \ #define OPEN_READER(name, gb) \
unsigned int name ## _index = (gb)->index; \ unsigned int name ## _index = (gb)->index; \
unsigned int av_unused name ## _cache = 0; \ unsigned int av_unused name ## _cache = 0; \
unsigned int av_unused name ## _size_plus8 = (gb)->size_in_bits_plus8 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 #endif
#define CLOSE_READER(name, gb) (gb)->index = name ## _index #define CLOSE_READER(name, gb) (gb)->index = name ## _index

4
libavcodec/golomb.h
View File

@ -138,7 +138,7 @@ static inline unsigned svq3_get_ue_golomb(GetBitContext *gb)
ret = (ret << 4) | ff_interleaved_dirac_golomb_vlc_code[buf]; ret = (ret << 4) | ff_interleaved_dirac_golomb_vlc_code[buf];
UPDATE_CACHE(re, gb); UPDATE_CACHE(re, gb);
buf = GET_CACHE(re, gb); buf = GET_CACHE(re, gb);
} while (HAVE_BITS_REMAINING(re, gb)); } while (BITS_AVAILABLE(re, gb));
CLOSE_READER(re, gb); CLOSE_READER(re, gb);
return ret - 1; return ret - 1;
@ -328,7 +328,7 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit,
return buf; return buf;
} else { } else {
int i; 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); LAST_SKIP_BITS(re, gb, 1);
UPDATE_CACHE(re, gb); UPDATE_CACHE(re, gb);
} }