summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2014-05-04 19:09:30 +0300
committerMartin Storsjo <martin@martin.st>2014-05-04 22:42:13 +0300
commit7afed9a1b6d3c3a17f690225ab4254a5583b7d46 (patch)
treea2c1914de2157412d94a0e60a942069fa9f36eba
parentdfb8fc917af794494586f541458532b080812b03 (diff)
downloadlibvpx-7afed9a1b6d3c3a17f690225ab4254a5583b7d46.tar
libvpx-7afed9a1b6d3c3a17f690225ab4254a5583b7d46.tar.gz
libvpx-7afed9a1b6d3c3a17f690225ab4254a5583b7d46.tar.bz2
libvpx-7afed9a1b6d3c3a17f690225ab4254a5583b7d46.zip
Use INLINE and include vpx_config.h instead of plain 'inline'
This fixes compilation with MSVC. Change-Id: Iaf7d6b0a0134968a6addf315fde6d852f298db8c
-rw-r--r--vp8/common/arm/neon/loopfilter_neon.c3
-rw-r--r--vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c3
-rw-r--r--vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c3
-rw-r--r--vp8/common/arm/neon/mbloopfilter_neon.c3
4 files changed, 8 insertions, 4 deletions
diff --git a/vp8/common/arm/neon/loopfilter_neon.c b/vp8/common/arm/neon/loopfilter_neon.c
index 47f522bc6..be77e6726 100644
--- a/vp8/common/arm/neon/loopfilter_neon.c
+++ b/vp8/common/arm/neon/loopfilter_neon.c
@@ -9,8 +9,9 @@
*/
#include <arm_neon.h>
+#include "./vpx_config.h"
-static inline void vp8_loop_filter_neon(
+static INLINE void vp8_loop_filter_neon(
uint8x16_t qblimit, // flimit
uint8x16_t qlimit, // limit
uint8x16_t qthresh, // thresh
diff --git a/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c b/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c
index 3d024e068..b25686ffb 100644
--- a/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c
+++ b/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c
@@ -9,8 +9,9 @@
*/
#include <arm_neon.h>
+#include "./vpx_config.h"
-static inline void vp8_loop_filter_simple_horizontal_edge_neon(
+static INLINE void vp8_loop_filter_simple_horizontal_edge_neon(
unsigned char *s,
int p,
const unsigned char *blimit) {
diff --git a/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c b/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c
index 68bcde412..b0952b582 100644
--- a/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c
+++ b/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c
@@ -9,8 +9,9 @@
*/
#include <arm_neon.h>
+#include "./vpx_config.h"
-static inline void vp8_loop_filter_simple_vertical_edge_neon(
+static INLINE void vp8_loop_filter_simple_vertical_edge_neon(
unsigned char *s,
int p,
const unsigned char *blimit) {
diff --git a/vp8/common/arm/neon/mbloopfilter_neon.c b/vp8/common/arm/neon/mbloopfilter_neon.c
index 396031720..5351f4be6 100644
--- a/vp8/common/arm/neon/mbloopfilter_neon.c
+++ b/vp8/common/arm/neon/mbloopfilter_neon.c
@@ -9,8 +9,9 @@
*/
#include <arm_neon.h>
+#include "./vpx_config.h"
-static inline void vp8_mbloop_filter_neon(
+static INLINE void vp8_mbloop_filter_neon(
uint8x16_t qblimit, // mblimit
uint8x16_t qlimit, // limit
uint8x16_t qthresh, // thresh