lavc,lavfi: use avutil/thread.h instead of redundant conditional includes
authorClément Bœsch <u@pkh.me>
Wed, 20 Jan 2016 20:36:10 +0000 (21:36 +0100)
committerClément Bœsch <u@pkh.me>
Wed, 20 Jan 2016 20:36:54 +0000 (21:36 +0100)
This was somehow forgotten in a8bb81a05c519dd3f36cc341e5fb448f6d17fa73.

libavcodec/pthread_slice.c
libavfilter/pthread.c

index b2a15c6..3ba5c66 100644 (file)
 
 #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);
index 070b3bd..1c54193 100644 (file)
 #include "libavutil/common.h"
 #include "libavutil/cpu.h"
 #include "libavutil/mem.h"
+#include "libavutil/thread.h"
 
 #include "avfilter.h"
 #include "internal.h"
 #include "thread.h"
 
-#if HAVE_PTHREADS
-#include <pthread.h>
-#elif HAVE_OS2THREADS
-#include "compat/os2threads.h"
-#elif HAVE_W32THREADS
-#include "compat/w32pthreads.h"
-#endif
-
 typedef struct ThreadContext {
     AVFilterGraph *graph;