Browse Source

os2threads: move from lavc to compat/

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.0
Dave Yeo Michael Niedermayer 12 years ago
parent
commit
e615a77799
7 changed files with 6 additions and 5 deletions
  1. +0
    -0
      compat/os2threads.h
  2. +0
    -1
      libavcodec/Makefile
  3. +1
    -1
      libavcodec/frame_thread_encoder.c
  4. +1
    -1
      libavcodec/pthread.c
  5. +1
    -1
      libavcodec/vp8.h
  6. +2
    -0
      libavfilter/pthread.c
  7. +1
    -1
      libavformat/network.c

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


+ 0
- 1
libavcodec/Makefile View 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 \


+ 1
- 1
libavcodec/frame_thread_encoder.c View 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


+ 1
- 1
libavcodec/pthread.c View 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);


+ 1
- 1
libavcodec/vp8.h View 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


+ 2
- 0
libavfilter/pthread.c View 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


+ 1
- 1
libavformat/network.c View 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


Loading…
Cancel
Save