diff options
Diffstat (limited to 'src/demuxers/flacutils.h')
| -rw-r--r-- | src/demuxers/flacutils.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/demuxers/flacutils.h b/src/demuxers/flacutils.h index 67f5d66c9..e69639925 100644 --- a/src/demuxers/flacutils.h +++ b/src/demuxers/flacutils.h @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA */ #ifndef __FLACUTILS_H__ @@ -73,19 +73,19 @@ static inline void _x_parse_flac_metadata_header(uint8_t *buffer, xine_flac_meta parsed->last = buffer[0] & 0x80 ? 1 : 0; parsed->blocktype = buffer[0] & 0x7f; - parsed->length = BE_24(&buffer[1]); + parsed->length = _X_BE_24(&buffer[1]); } static inline void _x_parse_flac_streaminfo_block(uint8_t *buffer, xine_flac_streaminfo_block *parsed) { - parsed->blocksize_min = BE_16(&buffer[0]); - parsed->blocksize_max = BE_16(&buffer[2]); - parsed->framesize_min = BE_24(&buffer[4]); - parsed->framesize_max = BE_24(&buffer[7]); - parsed->samplerate = BE_32(&buffer[10]); + parsed->blocksize_min = _X_BE_16(&buffer[0]); + parsed->blocksize_max = _X_BE_16(&buffer[2]); + parsed->framesize_min = _X_BE_24(&buffer[4]); + parsed->framesize_max = _X_BE_24(&buffer[7]); + parsed->samplerate = _X_BE_32(&buffer[10]); parsed->channels = ((parsed->samplerate >> 9) & 0x07) + 1; parsed->bits_per_sample = ((parsed->samplerate >> 4) & 0x1F) + 1; parsed->samplerate >>= 12; - parsed->total_samples = BE_64(&buffer[10]) & UINT64_C(0x0FFFFFFFFF); /* 36 bits */ + parsed->total_samples = _X_BE_64(&buffer[10]) & UINT64_C(0x0FFFFFFFFF); /* 36 bits */ } #endif |