diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-21 11:53:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-21 11:53:32 +0100 |
| commit | 6b2db2f1b693da230346925fa6ac3bba67e06bfb (patch) | |
| tree | db4ec3b102733176216e20968ee563c4767e6f6b /thirdparty | |
| parent | 4965ddfaa1536fb179d4b156d1ecb8a72a3c565f (diff) | |
| parent | 570a8e6b408a39471c1f4d0d20b2dc147bdcc38f (diff) | |
Merge pull request #7122 from zaps166/webm_msvc2013
Fix compilation with MSVC 2013
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/libvpx/vpx_config.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/thirdparty/libvpx/vpx_config.h b/thirdparty/libvpx/vpx_config.h index 7058f0327b..9ed45d4006 100644 --- a/thirdparty/libvpx/vpx_config.h +++ b/thirdparty/libvpx/vpx_config.h @@ -9,7 +9,11 @@ #ifndef VPX_CONFIG_H #define VPX_CONFIG_H #define RESTRICT -#define INLINE inline +#if defined(_MSC_VER) && (_MSC_VER < 1900) + #define INLINE __inline +#else + #define INLINE inline +#endif #define HAVE_MIPS32 0 #define HAVE_MEDIA 0 |