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 /libavdevice | |
| 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 'libavdevice')
| -rw-r--r-- | libavdevice/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 9eb3d3b69c..531818a4f5 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -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 |