diff options
| author | hkuang <hkuang@google.com> | 2013-11-07 15:50:31 -0800 |
|---|---|---|
| committer | hkuang <hkuang@google.com> | 2013-11-08 11:40:06 -0800 |
| commit | 5ae7ac49f08a179e4f054d99fcfc9dce78d26e58 (patch) | |
| tree | 0d891d2cbbac4c3da6fd15a25bf8797b29b31994 /libvpx/vp9/common/vp9_systemdependent.h | |
| parent | e6eeaaa14ccef4c0938fcce21c54979204041a30 (diff) | |
| download | android_external_libvpx-5ae7ac49f08a179e4f054d99fcfc9dce78d26e58.tar.gz android_external_libvpx-5ae7ac49f08a179e4f054d99fcfc9dce78d26e58.tar.bz2 android_external_libvpx-5ae7ac49f08a179e4f054d99fcfc9dce78d26e58.zip | |
Roll latest libvpx into Android.
The lastest libvpx just added multithread tile decoding support.
Checkout is from master: abdefeaa89a0908327518e5ca75c935c66b2e1aa
Bug:11576718
Change-Id: Icbe5430633e179b8dc6d419e280ad7ebd3cad4a0
Diffstat (limited to 'libvpx/vp9/common/vp9_systemdependent.h')
| -rw-r--r-- | libvpx/vp9/common/vp9_systemdependent.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libvpx/vp9/common/vp9_systemdependent.h b/libvpx/vp9/common/vp9_systemdependent.h index cc909e2..254a431 100644 --- a/libvpx/vp9/common/vp9_systemdependent.h +++ b/libvpx/vp9/common/vp9_systemdependent.h @@ -13,6 +13,7 @@ #ifdef _MSC_VER #include <math.h> +#define snprintf _snprintf #endif #include "./vpx_config.h" @@ -23,8 +24,8 @@ void vpx_reset_mmx_state(void); #define vp9_clear_system_state() #endif -#ifdef _MSC_VER -// round is not defined in MSVC +#if defined(_MSC_VER) && _MSC_VER < 1800 +// round is not defined in MSVC before VS2013. static int round(double x) { if (x < 0) return (int)ceil(x - 0.5); |