Browse Source

w32pthreads: move from lavc to compat/

It will be used in other places than lavc.
tags/n2.0
Anton Khirnov 12 years ago
parent
commit
90f9a5830b
6 changed files with 7 additions and 8 deletions
  1. +1
    -1
      Makefile
  2. +3
    -3
      compat/w32pthreads.h
  3. +0
    -1
      libavcodec/Makefile
  4. +1
    -1
      libavcodec/pthread.c
  5. +1
    -1
      libavcodec/vp8.h
  6. +1
    -1
      libavformat/network.c

+ 1
- 1
Makefile View File

@@ -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




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

@@ -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 */

+ 0
- 1
libavcodec/Makefile View File

@@ -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




+ 1
- 1
libavcodec/pthread.c View File

@@ -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);


+ 1
- 1
libavcodec/vp8.h View File

@@ -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


+ 1
- 1
libavformat/network.c View File

@@ -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




Loading…
Cancel
Save