libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_common.h

Index: source/libvpx/vp9/common/vp9_common.h
===================================================================
--- source/libvpx/vp9/common/vp9_common.h	(revision 177019)
+++ source/libvpx/vp9/common/vp9_common.h	(working copy)
@@ -8,7 +8,6 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-
 #ifndef VP9_COMMON_VP9_COMMON_H_
 #define VP9_COMMON_VP9_COMMON_H_
 
@@ -17,25 +16,34 @@
 /* Interface header for common constant data structures and lookup tables */
 
 #include "vpx_mem/vpx_mem.h"
+#include "vpx/vpx_integer.h"
 
-#include "vp9/common/vp9_common_types.h"
+#define TRUE    1
+#define FALSE   0
 
+#define MIN(x, y) (((x) < (y)) ? (x) : (y))
+#define MAX(x, y) (((x) > (y)) ? (x) : (y))
+
 /* Only need this for fixed-size arrays, for structs just assign. */
 
-#define vp9_copy( Dest, Src) { \
-    assert( sizeof( Dest) == sizeof( Src)); \
-    vpx_memcpy( Dest, Src, sizeof( Src)); \
+#define vp9_copy(Dest, Src) { \
+    assert(sizeof(Dest) == sizeof(Src)); \
+    vpx_memcpy(Dest, Src, sizeof(Src)); \
   }
 
 /* Use this for variably-sized arrays. */
 
-#define vp9_copy_array( Dest, Src, N) { \
-    assert( sizeof( *Dest) == sizeof( *Src)); \
-    vpx_memcpy( Dest, Src, N * sizeof( *Src)); \
+#define vp9_copy_array(Dest, Src, N) { \
+    assert(sizeof(*Dest) == sizeof(*Src)); \
+    vpx_memcpy(Dest, Src, N * sizeof(*Src)); \
   }
 
-#define vp9_zero( Dest)  vpx_memset( &Dest, 0, sizeof( Dest));
+#define vp9_zero(Dest) vpx_memset(&Dest, 0, sizeof(Dest));
 
-#define vp9_zero_array( Dest, N)  vpx_memset( Dest, 0, N * sizeof( *Dest));
+#define vp9_zero_array(Dest, N) vpx_memset(Dest, 0, N * sizeof(*Dest));
 
-#endif  /* common_h */
+static __inline uint8_t clip_pixel(int val) {
+  return (val > 255) ? 255u : (val < 0) ? 0u : val;
+}
+
+#endif  // VP9_COMMON_VP9_COMMON_H_