aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2016-01-20 21:36:10 +0100
committerClément Bœsch <u@pkh.me>2016-01-20 21:36:54 +0100
commita36201564163a267644f1b5bc58fca0e3c25a9fa (patch)
treec7d6da2c6c12d45a46f8fdf9fbc356a2630c6016 /libavcodec
parent4590811fc216115fc551d9d87a02e567d71db41f (diff)
downloadffmpeg-a36201564163a267644f1b5bc58fca0e3c25a9fa.tar.gz
lavc,lavfi: use avutil/thread.h instead of redundant conditional includes
This was somehow forgotten in a8bb81a05c519dd3f36cc341e5fb448f6d17fa73.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/pthread_slice.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/libavcodec/pthread_slice.c b/libavcodec/pthread_slice.c
index b2a15c6004..3ba5c665ad 100644
--- a/libavcodec/pthread_slice.c
+++ b/libavcodec/pthread_slice.c
@@ -24,14 +24,6 @@
#include "config.h"
-#if HAVE_PTHREADS
-#include <pthread.h>
-#elif HAVE_W32THREADS
-#include "compat/w32pthreads.h"
-#elif HAVE_OS2THREADS
-#include "compat/os2threads.h"
-#endif
-
#include "avcodec.h"
#include "internal.h"
#include "pthread_internal.h"
@@ -41,6 +33,7 @@
#include "libavutil/common.h"
#include "libavutil/cpu.h"
#include "libavutil/mem.h"
+#include "libavutil/thread.h"
typedef int (action_func)(AVCodecContext *c, void *arg);
typedef int (action_func2)(AVCodecContext *c, void *arg, int jobnr, int threadnr);