diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-10 10:41:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-10 10:51:03 +0200 |
| commit | b37ff488b8aab2fe1245f1ba3130b1d881559794 (patch) | |
| tree | 916940e9d93bfa3116056dca38aba3b1a340403c /libavdevice | |
| parent | ef13a005c41c353b03b29edf7a20d226747dac4e (diff) | |
| parent | e743e7ae6ee7e535c4394bec6fe6650d2b0dbf65 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libavutil: Make avpriv_open a library-internal function on msvcrt
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/Makefile | 2 | ||||
| -rw-r--r-- | libavdevice/file_open.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 340e0f1927..1c6a463c6a 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -10,6 +10,8 @@ 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 diff --git a/libavdevice/file_open.c b/libavdevice/file_open.c new file mode 100644 index 0000000000..494a5d37a4 --- /dev/null +++ b/libavdevice/file_open.c @@ -0,0 +1 @@ +#include "libavutil/file_open.c" |