Merge commit 'ed434be106a4615e0419b3ac7664220741afda2d'

[ffmpeg] / libavutil / thread.h

diff --git a/libavutil/thread.h b/libavutil/thread.h
index f108e2005269f972e242a6939314adcef4867ed3..309414aa7dd824ce100b54015542921911e10ef1 100644 (file)
--- a/libavutil/thread.h
+++ b/libavutil/thread.h
@@ -149,10 +149,10 @@ static inline int strict_pthread_once(pthread_once_t *once_control, void (*init_
 
 #define AVMutex char
 
-#define ff_mutex_init(mutex, attr) (0)
-#define ff_mutex_lock(mutex) (0)
-#define ff_mutex_unlock(mutex) (0)
-#define ff_mutex_destroy(mutex) (0)
+static inline int ff_mutex_init(AVMutex *mutex, const void *attr){ return 0; }
+static inline int ff_mutex_lock(AVMutex *mutex){ return 0; }
+static inline int ff_mutex_unlock(AVMutex *mutex){ return 0; }
+static inline int ff_mutex_destroy(AVMutex *mutex){ return 0; }
 
 #define AVOnce char
 #define AV_ONCE_INIT 0