Merge commit '81737f42c28858dad76a40284a35f7a64faa2fc7'

[ffmpeg] / libavfilter / pthread.c

diff --git a/libavfilter/pthread.c b/libavfilter/pthread.c
index 070b3bded50146e5e1564f4d779093a3e47fb540..37ca73f9ff8ac5deb20deef494a73b824afe4d54 100644 (file)
--- 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;
 
@@ -47,7 +40,7 @@ typedef struct ThreadContext {
     pthread_t *workers;
     avfilter_action_func *func;
 
-    /* per-execute perameters */
+    /* per-execute parameters */
     AVFilterContext *ctx;
     void *arg;
     int   *rets;