diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-04-27 19:15:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 19:15:26 +0200 |
| commit | c75dae3ed21bfa5a8ae46cd83d18329af5bea05a (patch) | |
| tree | ef657c38feb2368a3c86765778d1f068aa5eb614 /media/ffvpx/libavutil/thread.h | |
| parent | c82c6d960a7f19d6595171f9705c43514f20c1ec (diff) | |
| parent | 6ada4b14e4cfc91f5f1b2556623cab691f3ab813 (diff) | |
| download | UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar.gz UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar.lz UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar.xz UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.zip | |
Merge pull request #275 from trav90/ffvpx-resync
Resync ffvpx code with 3.4.2-release from upstream
Diffstat (limited to 'media/ffvpx/libavutil/thread.h')
| -rw-r--r-- | media/ffvpx/libavutil/thread.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/media/ffvpx/libavutil/thread.h b/media/ffvpx/libavutil/thread.h index 32ddf4036..f108e2005 100644 --- a/media/ffvpx/libavutil/thread.h +++ b/media/ffvpx/libavutil/thread.h @@ -26,8 +26,6 @@ #if HAVE_PTHREADS || HAVE_W32THREADS || HAVE_OS2THREADS -#define USE_ATOMICS 0 - #if HAVE_PTHREADS #include <pthread.h> @@ -38,8 +36,11 @@ #define ASSERT_PTHREAD_NORET(func, ...) do { \ int ret = func(__VA_ARGS__); \ if (ret) { \ + char errbuf[AV_ERROR_MAX_STRING_SIZE] = ""; \ av_log(NULL, AV_LOG_FATAL, AV_STRINGIFY(func) \ - " failed with error: %s\n", av_err2str(AVERROR(ret))); \ + " failed with error: %s\n", \ + av_make_error_string(errbuf, AV_ERROR_MAX_STRING_SIZE, \ + AVERROR(ret))); \ abort(); \ } \ } while (0) @@ -146,8 +147,6 @@ static inline int strict_pthread_once(pthread_once_t *once_control, void (*init_ #else -#define USE_ATOMICS 1 - #define AVMutex char #define ff_mutex_init(mutex, attr) (0) |