diff --git a/media/libvpx/libvpx/vpx/vpx_integer.h b/media/libvpx/libvpx/vpx/vpx_integer.h
--- a/media/libvpx/libvpx/vpx/vpx_integer.h
+++ b/media/libvpx/libvpx/vpx/vpx_integer.h
@@ -18,16 +18,18 @@
 #define VPX_FORCE_INLINE __forceinline
 #define VPX_INLINE __inline
 #else
 #define VPX_FORCE_INLINE __inline__ __attribute__(always_inline)
 // TODO(jbb): Allow a way to force inline off for older compilers.
 #define VPX_INLINE inline
 #endif
 
+#if !defined(VPX_DONT_DEFINE_STDINT_TYPES)
+
 #if defined(VPX_EMULATE_INTTYPES)
 typedef signed char int8_t;
 typedef signed short int16_t;
 typedef signed int int32_t;

 typedef unsigned char uint8_t;
 typedef unsigned short uint16_t;
 typedef unsigned int uint32_t;
@@ -48,16 +50,18 @@ typedef size_t uintptr_t;
 #define __STDC_LIMIT_MACROS
 #endif
 #endif  // __cplusplus

 #include <stdint.h>

 #endif

+#endif // VPX_DONT_DEFINE_STDINT_TYPES
+
 /* VS2010 defines stdint.h, but not inttypes.h */
 #if defined(_MSC_VER) && _MSC_VER < 1800
 #define PRId64 "I64d"
 #else
 #include <inttypes.h>
 #endif

 #endif  // VPX_VPX_INTEGER_H_