aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnav Gupta <championswimmer@gmail.com>2016-02-10 05:36:59 +0530
committerSteve Kondik <shade@chemlab.org>2016-02-29 07:30:24 -0800
commitf3bec54b7e7a7b0441e3ea2a2737cbf418340ea1 (patch)
treefd01719bdd52e04dcf101381c5b0f56c67c59b58
parentea5478ca9e27ffe4c19edb08a896f5d075732f6e (diff)
downloadandroid_external_ffmpeg-stable/cm-13.0-ZNH2K.tar.gz
android_external_ffmpeg-stable/cm-13.0-ZNH2K.tar.bz2
android_external_ffmpeg-stable/cm-13.0-ZNH2K.zip
libavutil: fix old style function definition warningsstable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2K
Change-Id: I879cef5a97542bba4a0923a79b94d044d62fcb7d Signed-off-by: Arnav Gupta <championswimmer@gmail.com>
-rw-r--r--libavutil/murmur3.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/murmur3.c b/libavutil/murmur3.c
index c4d8dcb529..246c6130f3 100644
--- a/libavutil/murmur3.c
+++ b/libavutil/murmur3.c
@@ -60,7 +60,7 @@ static uint64_t inline get_k1(const uint8_t *src)
return k;
}
-static uint64_t inline get_k2(const uint8_t *src)
+static inline uint64_t get_k2(const uint8_t *src)
{
uint64_t k = AV_RL64(src + 8);
k *= c2;
@@ -69,7 +69,7 @@ static uint64_t inline get_k2(const uint8_t *src)
return k;
}
-static uint64_t inline update_h1(uint64_t k, uint64_t h1, uint64_t h2)
+static inline uint64_t update_h1(uint64_t k, uint64_t h1, uint64_t h2)
{
k ^= h1;
k = ROT(k, 27);
@@ -79,7 +79,7 @@ static uint64_t inline update_h1(uint64_t k, uint64_t h1, uint64_t h2)
return k;
}
-static uint64_t inline update_h2(uint64_t k, uint64_t h1, uint64_t h2)
+static inline uint64_t update_h2(uint64_t k, uint64_t h1, uint64_t h2)
{
k ^= h2;
k = ROT(k, 31);