diff options
author | James Almer <jamrial@gmail.com> | 2018-01-04 01:11:43 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2018-01-04 15:22:19 -0300 |
commit | 8d9c9775b248b0a0f43bd96a242b5311fcc28b72 (patch) | |
tree | d6343571acb19164ede118ab31622c7059dc4e21 /libavutil | |
parent | 414a49d6710d90c0943c152a8d7bd521e1627125 (diff) | |
download | ffmpeg-streaming-8d9c9775b248b0a0f43bd96a242b5311fcc28b72.zip ffmpeg-streaming-8d9c9775b248b0a0f43bd96a242b5311fcc28b72.tar.gz |
avutil/log: use thread wrappers for the locking functionality
w32threads and os2threads both support static mutex initialization now,
so don't limit it to pthreads only.
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/log.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libavutil/log.c b/libavutil/log.c index 7a6dd93..bd47f2a 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -39,11 +39,9 @@ #include "common.h" #include "internal.h" #include "log.h" +#include "thread.h" -#if HAVE_PTHREADS -#include <pthread.h> -static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -#endif +static AVMutex mutex = AV_MUTEX_INITIALIZER; #define LINE_SZ 1024 @@ -317,9 +315,7 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) if (level > av_log_level) return; -#if HAVE_PTHREADS - pthread_mutex_lock(&mutex); -#endif + ff_mutex_lock(&mutex); format_line(ptr, level, fmt, vl, part, &print_prefix, type); snprintf(line, sizeof(line), "%s%s%s%s", part[0].str, part[1].str, part[2].str, part[3].str); @@ -356,9 +352,7 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) #endif end: av_bprint_finalize(part+3, NULL); -#if HAVE_PTHREADS - pthread_mutex_unlock(&mutex); -#endif + ff_mutex_unlock(&mutex); } static void (*av_log_callback)(void*, int, const char*, va_list) = |