summaryrefslogtreecommitdiff
path: root/src/libmusepack/musepack
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-04 14:01:47 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-04 14:01:47 +0200
commit60a408c3446733dc752979c1eab579c25a4a4897 (patch)
treef897ecb51396ecf9f61c0f4219bf6f5a6287d380 /src/libmusepack/musepack
parent15d6933ee064a25f1b9753841fb87f261ea3e736 (diff)
parentbdbfc75de59531f8a4d8d85b7e0e58c95365cbd7 (diff)
downloadxine-lib-60a408c3446733dc752979c1eab579c25a4a4897.tar.gz
xine-lib-60a408c3446733dc752979c1eab579c25a4a4897.tar.bz2
Merge from main repo.
Diffstat (limited to 'src/libmusepack/musepack')
-rw-r--r--src/libmusepack/musepack/internal.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libmusepack/musepack/internal.h b/src/libmusepack/musepack/internal.h
index 42a0e7156..f86b45bb3 100644
--- a/src/libmusepack/musepack/internal.h
+++ b/src/libmusepack/musepack/internal.h
@@ -8,6 +8,7 @@ enum {
MPC_DECODER_SYNTH_DELAY = 481
};
+#ifndef swap32
/// Big/little endian 32 bit byte swapping routine.
static inline
mpc_uint32_t swap32(mpc_uint32_t val) {
@@ -16,6 +17,7 @@ mpc_uint32_t swap32(mpc_uint32_t val) {
(mpc_uint32_t)src[0] |
((mpc_uint32_t)src[1] << 8) | ((mpc_uint32_t)src[2] << 16) | ((mpc_uint32_t)src[3] << 24);
}
+#endif
/// Searches for a ID3v2-tag and reads the length (in bytes) of it.
/// \param reader supplying raw stream data