From a36201564163a267644f1b5bc58fca0e3c25a9fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <u@pkh.me>
Date: Wed, 20 Jan 2016 21:36:10 +0100
Subject: [PATCH] lavc,lavfi: use avutil/thread.h instead of redundant
 conditional includes

This was somehow forgotten in a8bb81a05c519dd3f36cc341e5fb448f6d17fa73.
---
 libavcodec/pthread_slice.c | 9 +--------
 libavfilter/pthread.c      | 9 +--------
 2 files changed, 2 insertions(+), 16 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);
diff --git a/libavfilter/pthread.c b/libavfilter/pthread.c
index 070b3bded5..1c5419340d 100644
--- a/libavfilter/pthread.c
+++ b/libavfilter/pthread.c
@@ -27,19 +27,12 @@
 #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;