summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2013-07-12 16:17:22 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-07-12 16:17:22 -0700
commitcdea4a7c6646b572274f84cf0791012966edca89 (patch)
tree7eba95eca99f5afa480749ca6c0d9235d9fb21ea
parentaa518af8c71b1d9ab9798053bdc7113e0c4366dc (diff)
parentfb754b182f236730086753886961d5ea5c8efb5e (diff)
downloadlibvpx-cdea4a7c6646b572274f84cf0791012966edca89.tar
libvpx-cdea4a7c6646b572274f84cf0791012966edca89.tar.gz
libvpx-cdea4a7c6646b572274f84cf0791012966edca89.tar.bz2
libvpx-cdea4a7c6646b572274f84cf0791012966edca89.zip
Merge "Fix a build issue"
-rw-r--r--vp9/encoder/vp9_rdopt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 05978d3ea..a70c90447 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -299,7 +299,7 @@ static BLOCK_SIZE_TYPE get_plane_block_size(BLOCK_SIZE_TYPE bsize,
plane_block_height_log2by4(bsize, pd));
}
-static inline void linear_interpolate2(double x, int ntab, int inv_step,
+static INLINE void linear_interpolate2(double x, int ntab, int inv_step,
const double *tab1, const double *tab2,
double *v1, double *v2) {
double y = x * inv_step;