diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 20:52:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 20:52:14 +0100 |
| commit | 8e702bd3a8f5a4271590ab5aa38a41087ceaab1b (patch) | |
| tree | b250e79863728fe064c327702e9a2eb9dce489af /libavcodec | |
| parent | c9afeda55ef29534d7b565bd613122227e046d5b (diff) | |
| parent | d64341e498fa46c6cf4c23d408177d7489559654 (diff) | |
| download | ffmpeg-8e702bd3a8f5a4271590ab5aa38a41087ceaab1b.tar.gz | |
Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'
* commit 'd64341e498fa46c6cf4c23d408177d7489559654':
configure: Prefix libc-related variables with "libc_"
Conflicts:
libavdevice/Makefile
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c028c5e60f..0f6f881cf8 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -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 |