summaryrefslogtreecommitdiffstats
path: root/libavformat/Makefile
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-08-09 11:06:46 +0300
committerMartin Storsjö <martin@martin.st>2013-08-10 00:53:33 +0300
commite743e7ae6ee7e535c4394bec6fe6650d2b0dbf65 (patch)
treebd01128da10fffb0455a7392243428b799d53ac1 /libavformat/Makefile
parenta76d0cdf21c3d9e464623cc0ad1c005abf952afa (diff)
downloadffmpeg-streaming-e743e7ae6ee7e535c4394bec6fe6650d2b0dbf65.zip
ffmpeg-streaming-e743e7ae6ee7e535c4394bec6fe6650d2b0dbf65.tar.gz
libavutil: Make avpriv_open a library-internal function on msvcrt
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ö <martin@martin.st>
Diffstat (limited to 'libavformat/Makefile')
-rw-r--r--libavformat/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 5e2dd2a..0b788c9 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
OpenPOWER on IntegriCloud