ffmpeg | branch: master | Clément Bœsch <clem...@stupeflix.com> | Mon Dec 7 15:08:51 2015 +0100| [a8bb81a05c519dd3f36cc341e5fb448f6d17fa73] | committer: Clément Bœsch
lavc, lavu: use avutil/thread.h instead of redundant conditional includes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8bb81a05c519dd3f36cc341e5fb448f6d17fa73 --- libavcodec/frame_thread_encoder.c | 9 +-------- libavcodec/pthread_frame.c | 9 +-------- libavcodec/utils.c | 9 +-------- libavcodec/vp8.h | 9 +-------- libavutil/opencl.c | 10 +--------- libavutil/threadmessage.c | 12 +----------- 6 files changed, 6 insertions(+), 52 deletions(-) diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 14f2ea2..f4d35f9 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 7651211..b77dd1e 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 d5074dd..9a7ffde 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 2135bd9..cfd82aa 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 { diff --git a/libavutil/opencl.c b/libavutil/opencl.c index 62706f3..160076c 100644 --- a/libavutil/opencl.c +++ b/libavutil/opencl.c @@ -26,15 +26,7 @@ #include "log.h" #include "avassert.h" #include "opt.h" - -#if HAVE_THREADS -#if HAVE_PTHREADS -#include <pthread.h> -#elif HAVE_W32THREADS -#include "compat/w32pthreads.h" -#elif HAVE_OS2THREADS -#include "compat/os2threads.h" -#endif +#include "thread.h" #include "atomic.h" static pthread_mutex_t * volatile atomic_opencl_lock = NULL; diff --git a/libavutil/threadmessage.c b/libavutil/threadmessage.c index 3281e26..7c5cd24 100644 --- a/libavutil/threadmessage.c +++ b/libavutil/threadmessage.c @@ -20,17 +20,7 @@ #include "fifo.h" #include "threadmessage.h" -#if HAVE_THREADS -#if HAVE_PTHREADS -#include <pthread.h> -#elif HAVE_W32THREADS -#include "compat/w32pthreads.h" -#elif HAVE_OS2THREADS -#include "compat/os2threads.h" -#else -#error "Unknown threads implementation" -#endif -#endif +#include "thread.h" struct AVThreadMessageQueue { #if HAVE_THREADS _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
