* commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d': w32pthreads: move from lavc to compat/ Conflicts: libavcodec/Makefile libavcodec/pthread.c libavcodec/vp8.h
Unified · Split
| @@ -43,7 +43,7 @@ FFLIBS := avutil · 42 unmodified lines | |||
| 43 | DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset) $(SRC_PATH)/doc/ffprobe.xsd | 43 | DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset) $(SRC_PATH)/doc/ffprobe.xsd |
| 44 | EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examples/Makefile $(SRC_PATH)/doc/examples/README | 44 | EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examples/Makefile $(SRC_PATH)/doc/examples/README |
| 45 | 45 | ||
| 46 | SKIPHEADERS = cmdutils_common_opts.h | 46 | SKIPHEADERS = cmdutils_common_opts.h compat/w32pthreads.h |
| 47 | 47 | ||
| 48 | include $(SRC_PATH)/common.mak | 48 | include $(SRC_PATH)/common.mak |
| 49 | 49 | ||
| @@ -4,20 +4,20 @@ · 3 unmodified lines | |||
| 4 | * Authors: Steven Walters <kemuri9@gmail.com> | 4 | * Authors: Steven Walters <kemuri9@gmail.com> |
| 5 | * Pegasys Inc. <http://www.pegasys-inc.com> | 5 | * Pegasys Inc. <http://www.pegasys-inc.com> |
| 6 | * | 6 | * |
| 7 | * This file is part of Libav. | 7 | * This file is part of FFmpeg. |
| 8 | * | 8 | * |
| 9 | * Libav is free software; you can redistribute it and/or | 9 | * FFmpeg is free software; you can redistribute it and/or |
| 10 | * modify it under the terms of the GNU Lesser General Public | 10 | * modify it under the terms of the GNU Lesser General Public |
| 11 | * License as published by the Free Software Foundation; either | 11 | * License as published by the Free Software Foundation; either |
| 12 | * version 2.1 of the License, or (at your option) any later version. | 12 | * version 2.1 of the License, or (at your option) any later version. |
| 13 | * | 13 | * |
| 14 | * Libav is distributed in the hope that it will be useful, | 14 | * FFmpeg is distributed in the hope that it will be useful, |
| 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 17 | * Lesser General Public License for more details. | 17 | * Lesser General Public License for more details. |
| 18 | * | 18 | * |
| 19 | * You should have received a copy of the GNU Lesser General Public | 19 | * You should have received a copy of the GNU Lesser General Public |
| 20 | * License along with Libav; if not, write to the Free Software | 20 | * License along with FFmpeg; if not, write to the Free Software |
| 21 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 21 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| @@ -26,8 +26,8 @@ · 2 unmodified lines | |||
| 26 | * w32threads to pthreads wrapper | 26 | * w32threads to pthreads wrapper |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #ifndef AVCODEC_W32PTHREADS_H | 29 | #ifndef LIBAV_W32PTHREADS_H |
| 30 | #define AVCODEC_W32PTHREADS_H | 30 | #define LIBAV_W32PTHREADS_H |
| 31 | 31 | ||
| 32 | /* Build up a pthread-like API using underlying Windows API. Have only static | 32 | /* Build up a pthread-like API using underlying Windows API. Have only static |
| 33 | * methods so as to not conflict with a potentially linked in pthread-win32 | 33 | * methods so as to not conflict with a potentially linked in pthread-win32 |
| @@ -277,4 +277,4 @@ static void w32thread_init(void) · 243 unmodified lines | |||
| 277 | 277 | ||
| 278 | } | 278 | } |
| 279 | 279 | ||
| 280 | #endif /* AVCODEC_W32PTHREADS_H */ | 280 | #endif /* LIBAV_W32PTHREADS_H */ |
| @@ -804,7 +804,6 @@ SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h · 803 unmodified lines | |||
| 804 | SKIPHEADERS-$(CONFIG_VDA) += vda.h | 804 | SKIPHEADERS-$(CONFIG_VDA) += vda.h |
| 805 | SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h | 805 | SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h |
| 806 | SKIPHEADERS-$(HAVE_OS2THREADS) += os2threads.h | 806 | SKIPHEADERS-$(HAVE_OS2THREADS) += os2threads.h |
| 807 | SKIPHEADERS-$(HAVE_W32THREADS) += w32pthreads.h | ||
| 808 | 807 | ||
| 809 | TESTPROGS = cabac \ | 808 | TESTPROGS = cabac \ |
| 810 | dct \ | 809 | dct \ |
| @@ -30,7 +30,7 @@ · 29 unmodified lines | |||
| 30 | #if HAVE_PTHREADS | 30 | #if HAVE_PTHREADS |
| 31 | #include <pthread.h> | 31 | #include <pthread.h> |
| 32 | #elif HAVE_W32THREADS | 32 | #elif HAVE_W32THREADS |
| 33 | #include "w32pthreads.h" | 33 | #include "compat/w32pthreads.h" |
| 34 | #elif HAVE_OS2THREADS | 34 | #elif HAVE_OS2THREADS |
| 35 | #include "os2threads.h" | 35 | #include "os2threads.h" |
| 36 | #endif | 36 | #endif |
| @@ -61,7 +61,7 @@ · 60 unmodified lines | |||
| 61 | #if HAVE_PTHREADS | 61 | #if HAVE_PTHREADS |
| 62 | #include <pthread.h> | 62 | #include <pthread.h> |
| 63 | #elif HAVE_W32THREADS | 63 | #elif HAVE_W32THREADS |
| 64 | #include "w32pthreads.h" | 64 | #include "compat/w32pthreads.h" |
| 65 | #elif HAVE_OS2THREADS | 65 | #elif HAVE_OS2THREADS |
| 66 | #include "os2threads.h" | 66 | #include "os2threads.h" |
| 67 | #endif | 67 | #endif |
| @@ -36,7 +36,7 @@ · 35 unmodified lines | |||
| 36 | #if HAVE_PTHREADS | 36 | #if HAVE_PTHREADS |
| 37 | #include <pthread.h> | 37 | #include <pthread.h> |
| 38 | #elif HAVE_W32THREADS | 38 | #elif HAVE_W32THREADS |
| 39 | #include "w32pthreads.h" | 39 | #include "compat/w32pthreads.h" |
| 40 | #elif HAVE_OS2THREADS | 40 | #elif HAVE_OS2THREADS |
| 41 | #include "os2threads.h" | 41 | #include "os2threads.h" |
| 42 | #endif | 42 | #endif |
| @@ -31,7 +31,7 @@ · 30 unmodified lines | |||
| 31 | #elif HAVE_OS2THREADS | 31 | #elif HAVE_OS2THREADS |
| 32 | #include "libavcodec/os2threads.h" | 32 | #include "libavcodec/os2threads.h" |
| 33 | #else | 33 | #else |
| 34 | #include "libavcodec/w32pthreads.h" | 34 | #include "compat/w32pthreads.h" |
| 35 | #endif | 35 | #endif |
| 36 | #endif | 36 | #endif |
| 37 | 37 | ||