libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_filter.h

Index: source/libvpx/vp9/common/vp9_filter.h
===================================================================
--- source/libvpx/vp9/common/vp9_filter.h	(revision 293081)
+++ source/libvpx/vp9/common/vp9_filter.h	(working copy)
@@ -31,17 +31,14 @@
   EIGHTTAP = 0,
   EIGHTTAP_SMOOTH = 1,
   EIGHTTAP_SHARP = 2,
+  SWITCHABLE_FILTERS = 3, /* Number of switchable filters */
   BILINEAR = 3,
+  // The codec can operate in four possible inter prediction filter mode:
+  // 8-tap, 8-tap-smooth, 8-tap-sharp, and switching between the three.
+  SWITCHABLE_FILTER_CONTEXTS = SWITCHABLE_FILTERS + 1,
   SWITCHABLE = 4  /* should be the last one */
 } INTERP_FILTER;
 
-// Number of switchable filters
-#define SWITCHABLE_FILTERS 3
-
-// The codec can operate in four possible inter prediction filter mode:
-// 8-tap, 8-tap-smooth, 8-tap-sharp, and switching between the three.
-#define SWITCHABLE_FILTER_CONTEXTS (SWITCHABLE_FILTERS + 1)
-
 typedef int16_t InterpKernel[SUBPEL_TAPS];
 
 const InterpKernel *vp9_get_interp_kernel(INTERP_FILTER filter);