diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 12:32:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 13:01:41 +0200 |
| commit | a4d3757b29b5e9affd97cbc4e6fc2d202378610b (patch) | |
| tree | 11fcdd0668836e62b9b999292ff2a33bbc0bbbb8 | |
| parent | ecbd96ed23f07dfabc613b3fa2dcf394b2863203 (diff) | |
| parent | 90f9a5830b5d332de7ebb1ab45589f1870cbd65d (diff) | |
| download | ffmpeg-a4d3757b29b5e9affd97cbc4e6fc2d202378610b.tar.gz | |
Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'
* commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d':
w32pthreads: move from lavc to compat/
Conflicts:
libavcodec/Makefile
libavcodec/pthread.c
libavcodec/vp8.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | compat/w32pthreads.h (renamed from libavcodec/w32pthreads.h) | 14 | ||||
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/frame_thread_encoder.c | 2 | ||||
| -rw-r--r-- | libavcodec/pthread.c | 2 | ||||
| -rw-r--r-- | libavcodec/vp8.h | 2 | ||||
| -rw-r--r-- | libavformat/network.c | 2 |
7 files changed, 12 insertions, 13 deletions
@@ -43,7 +43,7 @@ FFLIBS := avutil DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset) $(SRC_PATH)/doc/ffprobe.xsd EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examples/Makefile $(SRC_PATH)/doc/examples/README -SKIPHEADERS = cmdutils_common_opts.h +SKIPHEADERS = cmdutils_common_opts.h compat/w32pthreads.h include $(SRC_PATH)/common.mak diff --git a/libavcodec/w32pthreads.h b/compat/w32pthreads.h index 11ee2faee8..71c1da6abf 100644 --- a/libavcodec/w32pthreads.h +++ b/compat/w32pthreads.h @@ -4,20 +4,20 @@ * Authors: Steven Walters <kemuri9@gmail.com> * Pegasys Inc. <http://www.pegasys-inc.com> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -26,8 +26,8 @@ * 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 * methods so as to not conflict with a potentially linked in pthread-win32 @@ -277,4 +277,4 @@ static void w32thread_init(void) } -#endif /* AVCODEC_W32PTHREADS_H */ +#endif /* LIBAV_W32PTHREADS_H */ diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c0d165a6b4..cbcc587d65 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -804,7 +804,6 @@ SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h SKIPHEADERS-$(CONFIG_VDA) += vda.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h SKIPHEADERS-$(HAVE_OS2THREADS) += os2threads.h -SKIPHEADERS-$(HAVE_W32THREADS) += w32pthreads.h TESTPROGS = cabac \ dct \ diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index b11a54af2b..98c50abe3a 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -30,7 +30,7 @@ #if HAVE_PTHREADS #include <pthread.h> #elif HAVE_W32THREADS -#include "w32pthreads.h" +#include "compat/w32pthreads.h" #elif HAVE_OS2THREADS #include "os2threads.h" #endif diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index f3e0f71b54..036d53bc4f 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -61,7 +61,7 @@ #if HAVE_PTHREADS #include <pthread.h> #elif HAVE_W32THREADS -#include "w32pthreads.h" +#include "compat/w32pthreads.h" #elif HAVE_OS2THREADS #include "os2threads.h" #endif diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h index 90109ad154..1bba79e415 100644 --- a/libavcodec/vp8.h +++ b/libavcodec/vp8.h @@ -36,7 +36,7 @@ #if HAVE_PTHREADS #include <pthread.h> #elif HAVE_W32THREADS -#include "w32pthreads.h" +#include "compat/w32pthreads.h" #elif HAVE_OS2THREADS #include "os2threads.h" #endif diff --git a/libavformat/network.c b/libavformat/network.c index ceed719356..abb89b331e 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -31,7 +31,7 @@ #elif HAVE_OS2THREADS #include "libavcodec/os2threads.h" #else -#include "libavcodec/w32pthreads.h" +#include "compat/w32pthreads.h" #endif #endif |