Merge "vp9/common: Silence MSVC warning in vp9_convolve.c."

e876cf38 · Tom Finegan · Gerrit Code Review · e844624a · bf79a4da · e876cf38
Commit e876cf38 authored Feb 07, 2014 by Tom Finegan Committed by Gerrit Code Review Feb 07, 2014
--- a/vp9/common/vp9_convolve.c
+++ b/vp9/common/vp9_convolve.c
@@ -145,7 +145,7 @@ static const InterpKernel *get_filter_base(const int16_t *filter) {
 }

 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,