diff options
author | Clément Bœsch <clement@stupeflix.com> | 2015-12-07 15:08:51 +0100 |
---|---|---|
committer | Clément Bœsch <clement@stupeflix.com> | 2015-12-07 17:25:51 +0100 |
commit | a8bb81a05c519dd3f36cc341e5fb448f6d17fa73 (patch) | |
tree | d3d39f117605090d8c45bd8b1d6a415a286e6e4e /libavutil | |
parent | a0050d9bf9b6b2d46c78b0e64041728e28535fa5 (diff) | |
download | ffmpeg-a8bb81a05c519dd3f36cc341e5fb448f6d17fa73.tar.gz |
lavc, lavu: use avutil/thread.h instead of redundant conditional includes
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/opencl.c | 10 | ||||
-rw-r--r-- | libavutil/threadmessage.c | 12 |
2 files changed, 2 insertions, 20 deletions
diff --git a/libavutil/opencl.c b/libavutil/opencl.c index 62706f3094..160076ca2d 100644 --- a/libavutil/opencl.c +++ b/libavutil/opencl.c @@ -26,15 +26,7 @@ #include "log.h" #include "avassert.h" #include "opt.h" - -#if HAVE_THREADS -#if HAVE_PTHREADS -#include <pthread.h> -#elif HAVE_W32THREADS -#include "compat/w32pthreads.h" -#elif HAVE_OS2THREADS -#include "compat/os2threads.h" -#endif +#include "thread.h" #include "atomic.h" static pthread_mutex_t * volatile atomic_opencl_lock = NULL; diff --git a/libavutil/threadmessage.c b/libavutil/threadmessage.c index 3281e26285..7c5cd2463c 100644 --- a/libavutil/threadmessage.c +++ b/libavutil/threadmessage.c @@ -20,17 +20,7 @@ #include "fifo.h" #include "threadmessage.h" -#if HAVE_THREADS -#if HAVE_PTHREADS -#include <pthread.h> -#elif HAVE_W32THREADS -#include "compat/w32pthreads.h" -#elif HAVE_OS2THREADS -#include "compat/os2threads.h" -#else -#error "Unknown threads implementation" -#endif -#endif +#include "thread.h" struct AVThreadMessageQueue { #if HAVE_THREADS |