virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'

Browse Source 
* commit 'd64341e498fa46c6cf4c23d408177d7489559654':
  configure: Prefix libc-related variables with "libc_"

Conflicts:
	libavdevice/Makefile
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-09 20:52:14 +01:00
commit 8e702bd3a8
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -1540,6 +1540,7 @@ HAVE_LIST="
jack_port_get_latency_range
kbhit
ldbrx
libc_msvcrt
libdc1394_1
libdc1394_2
local_aligned_16
@ -1559,7 +1560,6 @@ HAVE_LIST="
mm_empty
mmap
mprotect
msvcrt
nanosleep
openjpeg_1_5_openjpeg_h
PeekNamedPipe
@ -1794,7 +1794,7 @@ need_memalign="altivec neon sse"
symver_if_any="symver_asm_label symver_gnu_asm"
log2_deps="!msvcrt"
log2_deps="!libc_msvcrt"
# subsystems
dct_select="rdft"
@ -3854,7 +3854,7 @@ elif check_cpp_condition sys/brand.h "defined SOLARIS_BRAND_NAME"; then
add_cppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
fi
test -n "$libc_type" && enable $libc_type
test -n "$libc_type" && enable libc_$libc_type
case $libc_type in
bionic)
@ -3870,7 +3870,7 @@ esac
# hacks for compiler/libc/os combinations
if enabled_all tms470 glibc; then
if enabled_all tms470 libc_glibc; then
CPPFLAGS="-I${source_path}/compat/tms470 ${CPPFLAGS}"
add_cppflags -D__USER_LABEL_PREFIX__=
add_cppflags -D__builtin_memset=memset
@ -3878,7 +3878,7 @@ if enabled_all tms470 glibc; then
add_cflags -pds=48 # incompatible redefinition of macro
fi
if enabled_all ccc glibc; then
if enabled_all ccc libc_glibc; then
add_ldflags -Wl,-z,now # calls to libots crash without this
fi

3
libavcodec/Makefile
View File

@ -31,8 +31,6 @@ OBJS = allcodecs.o \
resample2.o \
utils.o \
OBJS-$(HAVE_MSVCRT) += file_open.o
# parts needed for many different codecs
OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o
OBJS-$(CONFIG_AC3DSP) += ac3dsp.o
@ -808,6 +806,7 @@ OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o
OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o
# thread libraries
OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o
OBJS-$(HAVE_PTHREADS) += pthread.o pthread_slice.o pthread_frame.o
OBJS-$(HAVE_W32THREADS) += pthread.o pthread_slice.o pthread_frame.o
OBJS-$(HAVE_OS2THREADS) += pthread.o pthread_slice.o pthread_frame.o

4
libavdevice/Makefile
View File

@ -10,8 +10,6 @@ HEADERS = avdevice.h \
OBJS = alldevices.o \
avdevice.o \
OBJS-$(HAVE_MSVCRT) += file_open.o
# input/output devices
OBJS-$(CONFIG_ALSA_INDEV) += alsa-audio-common.o \
alsa-audio-dec.o timefilter.o
@ -51,6 +49,8 @@ OBJS-$(CONFIG_XV_OUTDEV) += xv.o
OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o
OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o
OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o
# Windows resource file
SLIBOBJS-$(HAVE_GNU_WINDRES) += avdeviceres.o

4
libavformat/Makefile
View File

@ -24,8 +24,6 @@ OBJS = allformats.o \
url.o \
utils.o \
OBJS-$(HAVE_MSVCRT) += file_open.o
OBJS-$(CONFIG_NETWORK) += network.o
OBJS-$(CONFIG_RIFFDEC) += riffdec.o
OBJS-$(CONFIG_RIFFENC) += riffenc.o
@ -467,6 +465,8 @@ OBJS-$(CONFIG_TLS_PROTOCOL) += tls.o
OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o
OBJS-$(CONFIG_UNIX_PROTOCOL) += unix.o
OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o
# Windows resource file
SLIBOBJS-$(HAVE_GNU_WINDRES) += avformatres.o

2
libavutil/internal.h
View File

@ -211,7 +211,7 @@ void avpriv_report_missing_feature(void *avc,
void avpriv_request_sample(void *avc,
const char *msg, ...) av_printf_format(2, 3);
#if HAVE_MSVCRT
#if HAVE_LIBC_MSVCRT
#define avpriv_open ff_open
#endif