diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-09 15:52:05 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-09 16:25:28 +0100 |
commit | ca5ec2bf51d8c4f8bb0a829d0a65c70c968888a3 (patch) | |
tree | a1a466cd3186398946e522ecac62ef1e2d85d1b2 /libavdevice | |
parent | 1a3cff4f7eadad5292b6d65f751b0273d3a4124a (diff) | |
parent | 01621202aad7e27b2a05c71d9ad7a19dfcbe17ec (diff) | |
download | ffmpeg-ca5ec2bf51d8c4f8bb0a829d0a65c70c968888a3.tar.gz |
Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'
* commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec':
build: miscellaneous cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
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 7e5bf4f51d..585827be82 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -9,6 +9,8 @@ OBJS = alldevices.o \ avdevice.o \ utils.o \ +OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o + # input/output devices OBJS-$(CONFIG_ALSA_INDEV) += alsa_dec.o alsa.o timefilter.o OBJS-$(CONFIG_ALSA_OUTDEV) += alsa_enc.o alsa.o @@ -53,8 +55,6 @@ 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 |