virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'

Browse Source 
* commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d':
  w32pthreads: move from lavc to compat/

Conflicts:
	libavcodec/Makefile
	libavcodec/pthread.c
	libavcodec/vp8.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-24 12:32:18 +02:00
parent ecbd96ed23 90f9a5830b
commit a4d3757b29
7 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -43,7 +43,7 @@ FFLIBS := avutil
DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset) $(SRC_PATH)/doc/ffprobe.xsd 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 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 include $(SRC_PATH)/common.mak

14
libavcodec/w32pthreads.h → compat/w32pthreads.h
View File

@@ -4,20 +4,20 @@
* Authors: Steven Walters <kemuri9@gmail.com> * Authors: Steven Walters <kemuri9@gmail.com>
* Pegasys Inc. <http://www.pegasys-inc.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 * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version. * 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 * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * 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 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
@@ -26,8 +26,8 @@
* w32threads to pthreads wrapper * w32threads to pthreads wrapper
*/ */
#ifndef AVCODEC_W32PTHREADS_H #ifndef LIBAV_W32PTHREADS_H
#define AVCODEC_W32PTHREADS_H #define LIBAV_W32PTHREADS_H
/* Build up a pthread-like API using underlying Windows API. Have only static /* 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 * 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 */

1
libavcodec/Makefile
View File

@@ -804,7 +804,6 @@ SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h
SKIPHEADERS-$(CONFIG_VDA) += vda.h SKIPHEADERS-$(CONFIG_VDA) += vda.h
SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h
SKIPHEADERS-$(HAVE_OS2THREADS) += os2threads.h SKIPHEADERS-$(HAVE_OS2THREADS) += os2threads.h
SKIPHEADERS-$(HAVE_W32THREADS) += w32pthreads.h
TESTPROGS = cabac \ TESTPROGS = cabac \
dct \ dct \

2
libavcodec/frame_thread_encoder.c
View File

@@ -30,7 +30,7 @@
#if HAVE_PTHREADS #if HAVE_PTHREADS
#include <pthread.h> #include <pthread.h>
#elif HAVE_W32THREADS #elif HAVE_W32THREADS
#include "w32pthreads.h" #include "compat/w32pthreads.h"
#elif HAVE_OS2THREADS #elif HAVE_OS2THREADS
#include "os2threads.h" #include "os2threads.h"
#endif #endif

2
libavcodec/pthread.c
View File

@@ -61,7 +61,7 @@
#if HAVE_PTHREADS #if HAVE_PTHREADS
#include <pthread.h> #include <pthread.h>
#elif HAVE_W32THREADS #elif HAVE_W32THREADS
#include "w32pthreads.h" #include "compat/w32pthreads.h"
#elif HAVE_OS2THREADS #elif HAVE_OS2THREADS
#include "os2threads.h" #include "os2threads.h"
#endif #endif

2
libavcodec/vp8.h
View File

@@ -36,7 +36,7 @@
#if HAVE_PTHREADS #if HAVE_PTHREADS
#include <pthread.h> #include <pthread.h>
#elif HAVE_W32THREADS #elif HAVE_W32THREADS
#include "w32pthreads.h" #include "compat/w32pthreads.h"
#elif HAVE_OS2THREADS #elif HAVE_OS2THREADS
#include "os2threads.h" #include "os2threads.h"
#endif #endif

2
libavformat/network.c
View File

@@ -31,7 +31,7 @@
#elif HAVE_OS2THREADS #elif HAVE_OS2THREADS
#include "libavcodec/os2threads.h" #include "libavcodec/os2threads.h"
#else #else
#include "libavcodec/w32pthreads.h" #include "compat/w32pthreads.h"
#endif #endif
#endif #endif