[FFmpeg-cvslog] thread: Define ff_mutex_* macros as stub functions when threads are disabled

Diego Biurrun git at videolan.org
Thu Oct 26 23:13:50 EEST 2017


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Fri Mar 31 19:04:56 2017 +0200| [193b09189004ede4a6998e69192d1a9f63602088] | committer: Diego Biurrun

thread: Define ff_mutex_* macros as stub functions when threads are disabled

Silences a bunch of "statement with no effect" warnings with threads disabled.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=193b09189004ede4a6998e69192d1a9f63602088
---

 libavutil/thread.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavutil/thread.h b/libavutil/thread.h
index cf0fbdda5f..ac76bb88e2 100644
--- a/libavutil/thread.h
+++ b/libavutil/thread.h
@@ -48,10 +48,10 @@
 
 #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



More information about the ffmpeg-cvslog mailing list