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 /libavformat/Makefile | |
| parent | c9afeda55ef29534d7b565bd613122227e046d5b (diff) | |
| parent | d64341e498fa46c6cf4c23d408177d7489559654 (diff) | |
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 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 6801782e8e..cf3352b96d 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -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 |