diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2015-12-07 15:08:51 +0100 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2015-12-07 17:25:51 +0100 |
| commit | a8bb81a05c519dd3f36cc341e5fb448f6d17fa73 (patch) | |
| tree | d3d39f117605090d8c45bd8b1d6a415a286e6e4e /libavcodec | |
| parent | a0050d9bf9b6b2d46c78b0e64041728e28535fa5 (diff) | |
| download | ffmpeg-a8bb81a05c519dd3f36cc341e5fb448f6d17fa73.tar.gz | |
lavc, lavu: use avutil/thread.h instead of redundant conditional includes
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/frame_thread_encoder.c | 9 | ||||
| -rw-r--r-- | libavcodec/pthread_frame.c | 9 | ||||
| -rw-r--r-- | libavcodec/utils.c | 9 | ||||
| -rw-r--r-- | libavcodec/vp8.h | 9 |
4 files changed, 4 insertions, 32 deletions
diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 14f2ea241b..f4d35f90d4 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -23,18 +23,11 @@ #include "libavutil/fifo.h" #include "libavutil/avassert.h" #include "libavutil/imgutils.h" +#include "libavutil/thread.h" #include "avcodec.h" #include "internal.h" #include "thread.h" -#if HAVE_PTHREADS -#include <pthread.h> -#elif HAVE_W32THREADS -#include "compat/w32pthreads.h" -#elif HAVE_OS2THREADS -#include "compat/os2threads.h" -#endif - #define MAX_THREADS 64 #define BUFFER_SIZE (2*MAX_THREADS) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 7651211abe..b77dd1e50a 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -26,14 +26,6 @@ #include <stdint.h> -#if HAVE_PTHREADS -#include <pthread.h> -#elif HAVE_W32THREADS -#include "compat/w32pthreads.h" -#elif HAVE_OS2THREADS -#include "compat/os2threads.h" -#endif - #include "avcodec.h" #include "internal.h" #include "pthread_internal.h" @@ -49,6 +41,7 @@ #include "libavutil/log.h" #include "libavutil/mem.h" #include "libavutil/opt.h" +#include "libavutil/thread.h" /** * Context used by codec threads and stored in their AVCodecInternal thread_ctx. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index d5074ddfeb..9a7ffde22d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -41,6 +41,7 @@ #include "libavutil/imgutils.h" #include "libavutil/samplefmt.h" #include "libavutil/dict.h" +#include "libavutil/thread.h" #include "avcodec.h" #include "libavutil/opt.h" #include "me_cmp.h" @@ -59,14 +60,6 @@ # include <iconv.h> #endif -#if HAVE_PTHREADS -#include <pthread.h> -#elif HAVE_W32THREADS -#include "compat/w32pthreads.h" -#elif HAVE_OS2THREADS -#include "compat/os2threads.h" -#endif - #include "libavutil/ffversion.h" const char av_codec_ffversion[] = "FFmpeg version " FFMPEG_VERSION; diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h index 2135bd9d83..cfd82aaaba 100644 --- a/libavcodec/vp8.h +++ b/libavcodec/vp8.h @@ -27,20 +27,13 @@ #define AVCODEC_VP8_H #include "libavutil/buffer.h" +#include "libavutil/thread.h" #include "h264pred.h" #include "thread.h" #include "vp56.h" #include "vp8dsp.h" -#if HAVE_PTHREADS -# include <pthread.h> -#elif HAVE_OS2THREADS -# include "compat/os2threads.h" -#elif HAVE_W32THREADS -# include "compat/w32pthreads.h" -#endif - #define VP8_MAX_QUANT 127 enum dct_token { |