diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-06-17 20:57:37 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-06-17 20:57:37 +0200 |
| commit | 9acdd1f2356605d742f236ca275460dd9928bb11 (patch) | |
| tree | 8ddba80cdf284cafdcac44de39f8099f396c0ed4 /src/demuxers/id3.h | |
| parent | 42dc706af7a1f43c7ded0cc28957c8beb9ab08b1 (diff) | |
| parent | 5935b6fbe5c4d83ea35a1464b3a1c32e00b23304 (diff) | |
| download | xine-lib-9acdd1f2356605d742f236ca275460dd9928bb11.tar.gz xine-lib-9acdd1f2356605d742f236ca275460dd9928bb11.tar.bz2 | |
Merge changes from Solaris branch. (1.2 branch commit).
Diffstat (limited to 'src/demuxers/id3.h')
| -rw-r--r-- | src/demuxers/id3.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/demuxers/id3.h b/src/demuxers/id3.h index 950348738..eea5930f1 100644 --- a/src/demuxers/id3.h +++ b/src/demuxers/id3.h @@ -183,21 +183,21 @@ static inline int id3v2_istag(uint8_t *ptr) { #if 0 /* parse an unsynchronized 16bits integer */ -static inline uint16_t BE_16_synchsafe(uint8_t buf[2]) { +static inline uint16_t _X_BE_16_synchsafe(uint8_t buf[2]) { return ((uint16_t)(buf[0] & 0x7F) << 7) | (uint16_t)(buf[1] & 0x7F); } #endif /* parse an unsynchronized 24bits integer */ -static inline uint32_t BE_24_synchsafe(uint8_t buf[3]) { +static inline uint32_t _X_BE_24_synchsafe(uint8_t buf[3]) { return ((uint32_t)(buf[0] & 0x7F) << 14) | ((uint32_t)(buf[1] & 0x7F) << 7) | (uint32_t)(buf[2] & 0x7F); } /* parse an unsynchronized 32bits integer */ -static inline uint32_t BE_32_synchsafe(uint8_t buf[4]) { +static inline uint32_t _X_BE_32_synchsafe(uint8_t buf[4]) { return ((uint32_t)(buf[0] & 0x7F) << 21) | ((uint32_t)(buf[1] & 0x7F) << 14) | ((uint32_t)(buf[2] & 0x7F) << 7) | |