summaryrefslogtreecommitdiff
path: root/vp9/common/vp9_reconinter.h
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2014-02-03 16:48:38 -0800
committerJames Zern <jzern@google.com>2014-02-03 16:48:38 -0800
commitcca4276dac7b4e441d8f7ac18a4ba1e0b4b1f864 (patch)
tree54ee7dc4ed57d31650e13580beb57eb3e94da95f /vp9/common/vp9_reconinter.h
parent1c3fc437717a790e2f97be5b5484b8914336af6e (diff)
downloadlibvpx-cca4276dac7b4e441d8f7ac18a4ba1e0b4b1f864.tar
libvpx-cca4276dac7b4e441d8f7ac18a4ba1e0b4b1f864.tar.gz
libvpx-cca4276dac7b4e441d8f7ac18a4ba1e0b4b1f864.tar.bz2
libvpx-cca4276dac7b4e441d8f7ac18a4ba1e0b4b1f864.zip
vp9_filter.h: rename interp_kernel type
-> InterpKernel avoids conflicts in variable names, fixing the build with various toolchains. broken since: 8691565 Removing subpix_fn_table struct. Change-Id: Ib5f6fdbcb494a97b62c75b99d4d826ff25d4c981
Diffstat (limited to 'vp9/common/vp9_reconinter.h')
-rw-r--r--vp9/common/vp9_reconinter.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/common/vp9_reconinter.h b/vp9/common/vp9_reconinter.h
index 3345d83e8..bf738c28b 100644
--- a/vp9/common/vp9_reconinter.h
+++ b/vp9/common/vp9_reconinter.h
@@ -35,7 +35,7 @@ void vp9_build_inter_predictor(const uint8_t *src, int src_stride,
const MV *mv_q3,
const struct scale_factors *sf,
int w, int h, int do_avg,
- const interp_kernel *kernel,
+ const InterpKernel *kernel,
enum mv_precision precision,
int x, int y);