ref: e876cf3869e9345d1625999a9f4b0cfd77cdbf79
parent: e844624a0e123bc58ed919b498f39dd0bd1a0034
parent: bf79a4da77e26e21567f89079236d42a99bc62e2
author: Tom Finegan <[email protected]>
date: Fri Feb 7 13:34:44 EST 2014
Merge "vp9/common: Silence MSVC warning in vp9_convolve.c."
--- a/vp9/common/vp9_convolve.c
+++ b/vp9/common/vp9_convolve.c
@@ -145,7 +145,7 @@
}
static int get_filter_offset(const int16_t *f, const InterpKernel *base) {
- return (const InterpKernel *)(intptr_t)f - base;
+ return (int)((const InterpKernel *)(intptr_t)f - base);
}
void vp9_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride,