RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
James Almer 2018-01-04 01:11:43 -03:00
parent 414a49d671
commit 8d9c9775b2
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavutil/log.c
View File

@ -39,11 +39,9 @@
#include "common.h" #include "common.h"
#include "internal.h" #include "internal.h"
#include "log.h" #include "log.h"
#include "thread.h"
#if HAVE_PTHREADS static AVMutex mutex = AV_MUTEX_INITIALIZER;
#include <pthread.h>
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
#endif
#define LINE_SZ 1024 #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) if (level > av_log_level)
return; return;
#if HAVE_PTHREADS ff_mutex_lock(&mutex);
pthread_mutex_lock(&mutex);
#endif
format_line(ptr, level, fmt, vl, part, &print_prefix, type); 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); 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 #endif
end: end:
av_bprint_finalize(part+3, NULL); av_bprint_finalize(part+3, NULL);
#if HAVE_PTHREADS ff_mutex_unlock(&mutex);
pthread_mutex_unlock(&mutex);
#endif
} }
static void (*av_log_callback)(void*, int, const char*, va_list) = static void (*av_log_callback)(void*, int, const char*, va_list) =