Support OS/2 threading and correct an include that shouldn't be system. Dave
From 7fb4b12dad0df2ff60fcfa796c34ddbbcd3aa470 Mon Sep 17 00:00:00 2001 From: Dave Yeo <dave.r.yeo@gmail.com> Date: Fri, 28 Nov 2014 23:34:20 -0800 Subject: [PATCH 1/2] libavutil/thread.h: Support OS/2 threads --- libavutil/thread.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libavutil/thread.h b/libavutil/thread.h index 62e1340..a004fba 100644 --- a/libavutil/thread.h +++ b/libavutil/thread.h @@ -24,10 +24,12 @@ #include "config.h" -#if HAVE_PTHREADS || HAVE_W32THREADS +#if HAVE_PTHREADS || HAVE_W32THREADS || HAVE_OS2THREADS #if HAVE_PTHREADS #include <pthread.h> +#elif HAVE_OS2THREADS +#include "compat/os2threads.h" #else #include <compat/w32pthreads.h> #endif -- 1.7.2.3
From 8901a6d771df67701437f81d8b373e5ab2df42b4 Mon Sep 17 00:00:00 2001 From: Dave Yeo <dave.r.yeo@gmail.com> Date: Fri, 28 Nov 2014 23:36:06 -0800 Subject: [PATCH 2/2] libavutil/threads.h: correct an include to be local --- libavutil/thread.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavutil/thread.h b/libavutil/thread.h index a004fba..9733661 100644 --- a/libavutil/thread.h +++ b/libavutil/thread.h @@ -31,7 +31,7 @@ #elif HAVE_OS2THREADS #include "compat/os2threads.h" #else -#include <compat/w32pthreads.h> +#include "compat/w32pthreads.h" #endif #define AVMutex pthread_mutex_t -- 1.7.2.3
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
