aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-07-15 00:19:44 +0300
committerRonald S. Bultje <rsbultje@gmail.com>2012-07-14 19:19:33 -0700
commita794600c00c795b283e7864a2f55c2a3748d3560 (patch)
tree5e4c304ad251c6bde539bf7a4f14633f72533b17
parent39d18f21a5fd06c79b16a505b19cbdd15c6e093c (diff)
downloadffmpeg-a794600c00c795b283e7864a2f55c2a3748d3560.tar.gz
vp8: Include the thread headers before using the pthread types
This was unnoticed on linux, since stdlib.h apparently includes files declaring the pthread_mutex_t and pthread_cond_t types. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
-rw-r--r--libavcodec/vp8.c6
-rw-r--r--libavcodec/vp8.h5
2 files changed, 5 insertions, 6 deletions
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index ee954fc16a..e39fc0bf93 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -31,12 +31,6 @@
#include "rectangle.h"
#include "thread.h"
-#if HAVE_PTHREADS
-#include <pthread.h>
-#elif HAVE_W32THREADS
-#include "w32pthreads.h"
-#endif
-
#if ARCH_ARM
# include "arm/vp8.h"
#endif
diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h
index 1355da4d68..458a11abe0 100644
--- a/libavcodec/vp8.h
+++ b/libavcodec/vp8.h
@@ -30,6 +30,11 @@
#include "vp56data.h"
#include "vp8dsp.h"
#include "h264pred.h"
+#if HAVE_PTHREADS
+#include <pthread.h>
+#elif HAVE_W32THREADS
+#include "w32pthreads.h"
+#endif
#define VP8_MAX_QUANT 127