/**
* Read 0-64 bits.
*/
-static inline uint64_t get_bits_longlong(GetBitContext *s, int n)
+static inline uint64_t get_bits64(GetBitContext *s, int n)
{
- if (n <= 32)
+ if (n <= 32) {
return get_bits_long(s, n);
- else {
+ } else {
#ifdef BITSTREAM_READER_LE
uint64_t ret = get_bits_long(s, 32);
- return ret | (((uint64_t)get_bits_long(s, n-32)) << 32);
+ return ret | (uint64_t)get_bits_long(s, n - 32) << 32;
#else
- uint64_t ret = ((uint64_t)get_bits_long(s, 32)) << (n-32);
- return ret | get_bits_long(s, n-32);
+ uint64_t ret = (uint64_t)get_bits_long(s, n - 32) << 32;
+ return ret | get_bits_long(s, 32);
#endif
}
}