os2threads: move from lavc to compat/
authorDave Yeo <daveryeo@telus.net>
Tue, 28 May 2013 06:22:10 +0000 (23:22 -0700)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 10:49:20 +0000 (12:49 +0200)
For useage in other places besides lavc. Needed after commit
90f9a5830b5d332de7ebb1ab45589f1870cbd65d

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
compat/os2threads.h [moved from libavcodec/os2threads.h with 100% similarity]
libavcodec/Makefile
libavcodec/frame_thread_encoder.c
libavcodec/pthread.c
libavcodec/vp8.h
libavfilter/pthread.c
libavformat/network.c

similarity index 100%
rename from libavcodec/os2threads.h
rename to compat/os2threads.h
index ad42d1a..32d51a1 100644 (file)
@@ -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                                                         \
index 80577ec..b9acefc 100644 (file)
@@ -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
index 259dab0..7968a61 100644 (file)
@@ -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);
index 1bba79e..3bc06a7 100644 (file)
@@ -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
index 0630ad2..eb40f00 100644 (file)
@@ -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
index abb89b3..766351e 100644 (file)
@@ -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