From 669e5093f63eda266e310d304ffc4a37a8c382a2 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 25 Jul 2003 13:15:16 +0000
Subject: [PATCH] warning fixes
Originally committed as revision 2082 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/alpha/asm.h | 4 ++--
libavcodec/bswap.h | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavcodec/alpha/asm.h b/libavcodec/alpha/asm.h
index c2983125a0c..9520a9fb59d 100644
--- a/libavcodec/alpha/asm.h
+++ b/libavcodec/alpha/asm.h
@@ -42,14 +42,14 @@
#define AMASK_CIX (1 << 2)
#define AMASK_MVI (1 << 8)
-inline static uint64_t BYTE_VEC(uint64_t x)
+static inline uint64_t BYTE_VEC(uint64_t x)
{
x |= x << 8;
x |= x << 16;
x |= x << 32;
return x;
}
-inline static uint64_t WORD_VEC(uint64_t x)
+static inline uint64_t WORD_VEC(uint64_t x)
{
x |= x << 16;
x |= x << 32;
diff --git a/libavcodec/bswap.h b/libavcodec/bswap.h
index 37c615b3ec7..460f7abd401 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;
--
GitLab