Merge pull request #7122 from zaps166/webm_msvc2013

Fix compilation with MSVC 2013

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