It will be used in other places than lavc.tags/n2.0
| @@ -84,7 +84,7 @@ FFLIBS := avutil | |||||
| DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.avpreset) | 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 | include $(SRC_PATH)/common.mak | ||||
| @@ -26,8 +26,8 @@ | |||||
| * w32threads to pthreads wrapper | * 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 | /* 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 | * methods so as to not conflict with a potentially linked in pthread-win32 | ||||
| @@ -276,4 +276,4 @@ static void w32thread_init(void) | |||||
| } | } | ||||
| #endif /* AVCODEC_W32PTHREADS_H */ | |||||
| #endif /* LIBAV_W32PTHREADS_H */ | |||||
| @@ -679,7 +679,6 @@ SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h | |||||
| SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h | SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h | ||||
| SKIPHEADERS-$(CONFIG_VDA) += vda.h | SKIPHEADERS-$(CONFIG_VDA) += vda.h | ||||
| SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h | SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h | ||||
| SKIPHEADERS-$(HAVE_W32THREADS) += w32pthreads.h | |||||
| EXAMPLES = api | EXAMPLES = api | ||||
| @@ -58,7 +58,7 @@ | |||||
| #if HAVE_PTHREADS | #if HAVE_PTHREADS | ||||
| #include <pthread.h> | #include <pthread.h> | ||||
| #elif HAVE_W32THREADS | #elif HAVE_W32THREADS | ||||
| #include "w32pthreads.h" | |||||
| #include "compat/w32pthreads.h" | |||||
| #endif | #endif | ||||
| typedef int (action_func)(AVCodecContext *c, void *arg); | typedef int (action_func)(AVCodecContext *c, void *arg); | ||||
| @@ -36,7 +36,7 @@ | |||||
| #if HAVE_PTHREADS | #if HAVE_PTHREADS | ||||
| #include <pthread.h> | #include <pthread.h> | ||||
| #elif HAVE_W32THREADS | #elif HAVE_W32THREADS | ||||
| #include "w32pthreads.h" | |||||
| #include "compat/w32pthreads.h" | |||||
| #endif | #endif | ||||
| #define VP8_MAX_QUANT 127 | #define VP8_MAX_QUANT 127 | ||||
| @@ -26,7 +26,7 @@ | |||||
| #if HAVE_PTHREADS | #if HAVE_PTHREADS | ||||
| #include <pthread.h> | #include <pthread.h> | ||||
| #else | #else | ||||
| #include "libavcodec/w32pthreads.h" | |||||
| #include "compat/w32pthreads.h" | |||||
| #endif | #endif | ||||
| #endif | #endif | ||||