virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

os2threads: move from lavc to compat/

Browse Source 
For useage in other places besides lavc. Needed after commit
90f9a5830b

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Dave Yeo
2013-05-27 23:22:10 -07:00
committed by Michael Niedermayer
parent 269fc8e049
commit e615a77799
7 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
libavcodec/os2threads.h → compat/os2threads.h
View File

1
libavcodec/Makefile
View File

@@ -803,7 +803,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_OS2THREADS) += os2threads.h
TESTPROGS = cabac \ TESTPROGS = cabac \
dct \ dct \

2
libavcodec/frame_thread_encoder.c
View File

@@ -32,7 +32,7 @@
#elif HAVE_W32THREADS #elif HAVE_W32THREADS
#include "compat/w32pthreads.h" #include "compat/w32pthreads.h"
#elif HAVE_OS2THREADS #elif HAVE_OS2THREADS
#include "os2threads.h" #include "compat/os2threads.h"
#endif #endif
#define MAX_THREADS 64 #define MAX_THREADS 64

2
libavcodec/pthread.c
View File

@@ -43,7 +43,7 @@
#elif HAVE_W32THREADS #elif HAVE_W32THREADS
#include "compat/w32pthreads.h" #include "compat/w32pthreads.h"
#elif HAVE_OS2THREADS #elif HAVE_OS2THREADS
#include "os2threads.h" #include "compat/os2threads.h"
#endif #endif
typedef int (action_func)(AVCodecContext *c, void *arg); typedef int (action_func)(AVCodecContext *c, void *arg);

2
libavcodec/vp8.h
View File

@@ -38,7 +38,7 @@
#elif HAVE_W32THREADS #elif HAVE_W32THREADS
#include "compat/w32pthreads.h" #include "compat/w32pthreads.h"
#elif HAVE_OS2THREADS #elif HAVE_OS2THREADS
#include "os2threads.h" #include "compat/os2threads.h"
#endif #endif
#define VP8_MAX_QUANT 127 #define VP8_MAX_QUANT 127

2
libavfilter/pthread.c
View File

@@ -34,6 +34,8 @@
#if HAVE_PTHREADS #if HAVE_PTHREADS
#include <pthread.h> #include <pthread.h>
#elif HAVE_OS2THREADS
#include "compat/os2threads.h"
#elif HAVE_W32THREADS #elif HAVE_W32THREADS
#include "compat/w32pthreads.h" #include "compat/w32pthreads.h"
#endif #endif

2
libavformat/network.c
View File

@@ -29,7 +29,7 @@
#if HAVE_PTHREADS #if HAVE_PTHREADS
#include <pthread.h> #include <pthread.h>
#elif HAVE_OS2THREADS #elif HAVE_OS2THREADS
#include "libavcodec/os2threads.h" #include "compat/os2threads.h"
#else #else
#include "compat/w32pthreads.h" #include "compat/w32pthreads.h"
#endif #endif