summaryrefslogtreecommitdiffstats
path: root/libaf
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-05-18 19:13:15 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-05-18 19:13:15 +0000
commit275cd9923c78ebce8a7b7ab01a5ebf0b5abb1c3e (patch)
treea2063afeb0c79de6e11b495339f9e2ad03eefc0a /libaf
parent1ec95a2e53a66044f6712a3de35fef7ac25cb073 (diff)
downloadmpv-275cd9923c78ebce8a7b7ab01a5ebf0b5abb1c3e.tar.bz2
mpv-275cd9923c78ebce8a7b7ab01a5ebf0b5abb1c3e.tar.xz
using bswap.h for endianness conversion
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12487 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libaf')
-rw-r--r--libaf/af_format.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/libaf/af_format.c b/libaf/af_format.c
index 5f5a91dc63..a908ed0862 100644
--- a/libaf/af_format.c
+++ b/libaf/af_format.c
@@ -11,6 +11,7 @@
#include <limits.h>
#include "af.h"
+#include "../bswap.h"
// Integer to float conversion through lrintf()
#ifdef HAVE_LRINTF
@@ -379,10 +380,8 @@ static void endian(void* in, void* out, int len, int bps)
register int i;
switch(bps){
case(2):{
- register uint16_t s;
for(i=0;i<len;i++){
- s=((uint16_t*)in)[i];
- ((uint16_t*)out)[i]=(uint16_t)(((s&0x00FF)<<8) | (s&0xFF00)>>8);
+ ((uint16_t*)out)[i]=bswap_16(((uint16_t*)in)[i]);
}
break;
}
@@ -398,13 +397,8 @@ static void endian(void* in, void* out, int len, int bps)
break;
}
case(4):{
- register uint32_t s;
for(i=0;i<len;i++){
- s=((uint32_t*)in)[i];
- ((uint32_t*)out)[i]=(uint32_t)(((s&0x000000FF)<<24) |
- ((s&0x0000FF00)<<8) |
- ((s&0x00FF0000)>>8) |
- ((s&0xFF000000)>>24));
+ ((uint32_t*)out)[i]=bswap_32(((uint32_t*)in)[i]);
}
break;
}