From e743e7ae6ee7e535c4394bec6fe6650d2b0dbf65 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Fri, 9 Aug 2013 11:06:46 +0300 Subject: libavutil: Make avpriv_open a library-internal function on msvcrt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add one copy of the function into each of the libraries, similarly to what we do for log2_tab. When using static libs, only one copy of the file_open.o object file gets included, while when using shared libraries, each of them get a copy of its own. This fixes DLL builds with a statically linked C runtime, where each DLL effectively has got its own instance of the C runtime, where file descriptors can't be shared across runtimes. On systems not using msvcrt, the function is not duplicated. Signed-off-by: Martin Storsjö --- libavformat/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libavformat/Makefile') diff --git a/libavformat/Makefile b/libavformat/Makefile index 5e2dd2a540..0b788c94c4 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -23,6 +23,8 @@ 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 -- cgit v1.2.3