It will be used in other places than lavc.
---
Makefile | 2 +-
{libavcodec => compat}/w32pthreads.h | 6 +++---
libavcodec/Makefile | 1 -
libavcodec/pthread.c | 2 +-
libavcodec/vp8.h | 2 +-
libavformat/network.c | 2 +-
6 files changed, 7 insertions(+), 8 deletions(-)
rename {libavcodec => compat}/w32pthreads.h (98%)
diff --git a/Makefile b/Makefile
index 42ef8b0..783971f 100644
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,7 @@ FFLIBS := avutil
DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.avpreset)
-SKIPHEADERS = cmdutils_common_opts.h
+SKIPHEADERS = cmdutils_common_opts.h compat/w32pthreads.h
include $(SRC_PATH)/common.mak
diff --git a/libavcodec/w32pthreads.h b/compat/w32pthreads.h
similarity index 98%
rename from libavcodec/w32pthreads.h
rename to compat/w32pthreads.h
index 91e7353..76bbdcc 100644
--- a/libavcodec/w32pthreads.h
+++ b/compat/w32pthreads.h
@@ -26,8 +26,8 @@
* w32threads to pthreads wrapper
*/
-#ifndef AVCODEC_W32PTHREADS_H
-#define AVCODEC_W32PTHREADS_H
+#ifndef LIBAV_W32PTHREADS_H
+#define LIBAV_W32PTHREADS_H
/* Build up a pthread-like API using underlying Windows API. Have only static
* methods so as to not conflict with a potentially linked in pthread-win32
@@ -268,4 +268,4 @@ static void w32thread_init(void)
(void*)GetProcAddress(kernel_dll, "SleepConditionVariableCS");
}
-#endif /* AVCODEC_W32PTHREADS_H */
+#endif /* LIBAV_W32PTHREADS_H */
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 2c3522e..11ead47 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -677,7 +677,6 @@ SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h
SKIPHEADERS-$(CONFIG_VDA) += vda.h
SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h
-SKIPHEADERS-$(HAVE_W32THREADS) += w32pthreads.h
EXAMPLES = api
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 9855b35..7eac335 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -58,7 +58,7 @@
#if HAVE_PTHREADS
#include <pthread.h>
#elif HAVE_W32THREADS
-#include "w32pthreads.h"
+#include "compat/w32pthreads.h"
#endif
typedef int (action_func)(AVCodecContext *c, void *arg);
diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h
index 8631c8f..6ec3879 100644
--- a/libavcodec/vp8.h
+++ b/libavcodec/vp8.h
@@ -36,7 +36,7 @@
#if HAVE_PTHREADS
#include <pthread.h>
#elif HAVE_W32THREADS
-#include "w32pthreads.h"
+#include "compat/w32pthreads.h"
#endif
#define VP8_MAX_QUANT 127
diff --git a/libavformat/network.c b/libavformat/network.c
index 1f6bc10..f493c29 100644
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -26,7 +26,7 @@
#if HAVE_PTHREADS
#include <pthread.h>
#else
-#include "libavcodec/w32pthreads.h"
+#include "compat/w32pthreads.h"
#endif
#endif
--
1.7.10.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
