shithub: openh264

Download patch

ref: 98dd2d91d9cfcc3096743da56a7ef72f4abb5919
parent: cbe650a3e574e698d48fcdd57d2fe272e5baa166
author: Martin Storsjö <martin@martin.st>
date: Thu Jan 23 13:49:48 EST 2014 

Use 'inline' instead of 'inline_t' in the processing lib

Just use the standard inline keyword with sufficient backwards
compatibility defines, similar to how it is done in the main decoder
and encoder libraries.


--- a/codec/processing/src/common/memory.h
+++ b/codec/processing/src/common/memory.h
@@ -47,15 +47,15 @@
 
 WELSVP_NAMESPACE_BEGIN
 
-inline_t void* WelsMemset (void* pPointer, int32_t iValue, uint32_t uiSize) {
+inline void* WelsMemset (void* pPointer, int32_t iValue, uint32_t uiSize) {
   return ::memset (pPointer, iValue, uiSize);
 }
 
-inline_t void* WelsMemcpy (void* pDst, const void* kpSrc, uint32_t uiSize) {
+inline void* WelsMemcpy (void* pDst, const void* kpSrc, uint32_t uiSize) {
   return ::memcpy (pDst, kpSrc, uiSize);
 }
 
-inline_t int32_t WelsMemcmp (const void* kpBuf1, const void* kpBuf2, uint32_t uiSize) {
+inline int32_t WelsMemcmp (const void* kpBuf1, const void* kpBuf2, uint32_t uiSize) {
   return ::memcmp (kpBuf1, kpBuf2, uiSize);
 }
 
--- a/codec/processing/src/common/typedef.h
+++ b/codec/processing/src/common/typedef.h
@@ -68,11 +68,9 @@
 typedef unsigned int       uint32_t ;
 typedef __int64            int64_t  ;
 typedef unsigned __int64   uint64_t ;
-#define inline_t           _inline
-
-#else	// GCC
-
-#define inline_t           inline
+#if _MSC_VER < 1700
+#define inline            __inline
+#endif
 
 #endif
 
--- a/codec/processing/src/common/util.h
+++ b/codec/processing/src/common/util.h
@@ -84,7 +84,7 @@
 #define GET_METHOD(x)  ((x) & 0xff)          // mask method as the lowest 8bits
 #define GET_SPECIAL(x) (((x) >> 8) & 0xff)   // mask special flag as 8bits
 
-inline_t EMethods WelsVpGetValidMethod (int32_t a) {
+inline EMethods WelsVpGetValidMethod (int32_t a) {
   int32_t iMethod = GET_METHOD (a);
   return WelsStaticCast (EMethods, WELS_CLAMP (iMethod, METHOD_NULL + 1, METHOD_MASK - 1));
 }