summaryrefslogtreecommitdiff
path: root/libavcodec/bswap.h
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2003-07-25 13:15:16 +0000
committerAlex Beregszaszi <alex@rtfs.hu>2003-07-25 13:15:16 +0000
commit669e5093f63eda266e310d304ffc4a37a8c382a2 (patch)
treefda26dde486c628855b0cd5d16b582b68c8ae52b /libavcodec/bswap.h
parent008f085172255497ab08700f1a60d89a1c3385ca (diff)
warning fixes
Originally committed as revision 2082 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/bswap.h')
-rw-r--r--libavcodec/bswap.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/bswap.h b/libavcodec/bswap.h
index 37c615b3ec..460f7abd40 100644
--- a/libavcodec/bswap.h
+++ b/libavcodec/bswap.h
@@ -11,7 +11,7 @@
#else
#ifdef ARCH_X86
-inline static unsigned short ByteSwap16(unsigned short x)
+static inline unsigned short ByteSwap16(unsigned short x)
{
__asm("xchgb %b0,%h0" :
"=q" (x) :
@@ -20,7 +20,7 @@ inline static unsigned short ByteSwap16(unsigned short x)
}
#define bswap_16(x) ByteSwap16(x)
-inline static unsigned int ByteSwap32(unsigned int x)
+static inline unsigned int ByteSwap32(unsigned int x)
{
#if __CPU__ > 386
__asm("bswap %0":
@@ -36,7 +36,7 @@ inline static unsigned int ByteSwap32(unsigned int x)
}
#define bswap_32(x) ByteSwap32(x)
-inline static unsigned long long int ByteSwap64(unsigned long long int x)
+static inline unsigned long long int ByteSwap64(unsigned long long int x)
{
register union { __extension__ uint64_t __ll;
uint32_t __l[2]; } __x;
@@ -66,7 +66,7 @@ static inline uint32_t ByteSwap32(uint32_t x) {
#define bswap_16(x) ByteSwap16(x)
#define bswap_32(x) ByteSwap32(x)
-inline static uint64_t ByteSwap64(uint64_t x)
+static inline uint64_t ByteSwap64(uint64_t x)
{
union {
uint64_t ll;
@@ -90,7 +90,7 @@ inline static uint64_t ByteSwap64(uint64_t x)
((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
(((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
-inline static uint64_t ByteSwap64(uint64_t x)
+static inline uint64_t ByteSwap64(uint64_t x)
{
union {
uint64_t ll;