From e615a777990f9c9cd6dd4d5d85cb21f6e43e5d74 Mon Sep 17 00:00:00 2001
From: Dave Yeo <daveryeo@telus.net>
Date: Mon, 27 May 2013 23:22:10 -0700
Subject: [PATCH] os2threads: move from lavc to compat/
For useage in other places besides lavc. Needed after commit
90f9a5830b5d332de7ebb1ab45589f1870cbd65d
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
{libavcodec => compat}/os2threads.h | 0
libavcodec/Makefile | 1 -
libavcodec/frame_thread_encoder.c | 2 +-
libavcodec/pthread.c | 2 +-
libavcodec/vp8.h | 2 +-
libavfilter/pthread.c | 2 ++
libavformat/network.c | 2 +-
7 files changed, 6 insertions(+), 5 deletions(-)
rename {libavcodec => compat}/os2threads.h (100%)
diff --git a/libavcodec/os2threads.h b/compat/os2threads.h
similarity index 100%
rename from libavcodec/os2threads.h
rename to compat/os2threads.h
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index ad42d1aebbc..32d51a10665 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -803,7 +803,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_OS2THREADS) += os2threads.h
TESTPROGS = cabac \
dct \
diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c
index 80577ec9c4d..b9acefc1101 100644
--- a/libavcodec/frame_thread_encoder.c
+++ b/libavcodec/frame_thread_encoder.c
@@ -32,7 +32,7 @@
#elif HAVE_W32THREADS
#include "compat/w32pthreads.h"
#elif HAVE_OS2THREADS
-#include "os2threads.h"
+#include "compat/os2threads.h"
#endif
#define MAX_THREADS 64
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 259dab0d8c3..7968a613586 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -43,7 +43,7 @@
#elif HAVE_W32THREADS
#include "compat/w32pthreads.h"
#elif HAVE_OS2THREADS
-#include "os2threads.h"
+#include "compat/os2threads.h"
#endif
typedef int (action_func)(AVCodecContext *c, void *arg);
diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h
index 1bba79e4156..3bc06a7c58b 100644
--- a/libavcodec/vp8.h
+++ b/libavcodec/vp8.h
@@ -38,7 +38,7 @@
#elif HAVE_W32THREADS
#include "compat/w32pthreads.h"
#elif HAVE_OS2THREADS
-#include "os2threads.h"
+#include "compat/os2threads.h"
#endif
#define VP8_MAX_QUANT 127
diff --git a/libavfilter/pthread.c b/libavfilter/pthread.c
index 0630ad2f501..eb40f0058ee 100644
--- a/libavfilter/pthread.c
+++ b/libavfilter/pthread.c
@@ -34,6 +34,8 @@
#if HAVE_PTHREADS
#include <pthread.h>
+#elif HAVE_OS2THREADS
+#include "compat/os2threads.h"
#elif HAVE_W32THREADS
#include "compat/w32pthreads.h"
#endif
diff --git a/libavformat/network.c b/libavformat/network.c
index abb89b331e9..766351eb6eb 100644
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -29,7 +29,7 @@
#if HAVE_PTHREADS
#include <pthread.h>
#elif HAVE_OS2THREADS
-#include "libavcodec/os2threads.h"
+#include "compat/os2threads.h"
#else
#include "compat/w32pthreads.h"
#endif
--
GitLab