| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-10 08:41:46 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-10 08:51:03 (GMT) |
| commit | b37ff488b8aab2fe1245f1ba3130b1d881559794 (patch) | |
| tree | 916940e9d93bfa3116056dca38aba3b1a340403c | |
| parent | ef13a005c41c353b03b29edf7a20d226747dac4e (diff) | |
| parent | e743e7ae6ee7e535c4394bec6fe6650d2b0dbf65 (diff) | |
| download | ffmpeg-b37ff488b8aab2fe1245f1ba3130b1d881559794.zip ffmpeg-b37ff488b8aab2fe1245f1ba3130b1d881559794.tar.gz ffmpeg-b37ff488b8aab2fe1245f1ba3130b1d881559794.tar.bz2 | |
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>
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/file_open.c | 1 | ||||
| -rw-r--r-- | libavdevice/Makefile | 2 | ||||
| -rw-r--r-- | libavdevice/file_open.c | 1 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/file_open.c | 1 | ||||
| -rw-r--r-- | libavutil/internal.h | 4 |
7 files changed, 13 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b6b4263..5c8f9d5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -31,6 +31,8 @@ OBJS = allcodecs.o \ resample2.o \ utils.o \ +OBJS-$(HAVE_MSVCRT) += file_open.o + # parts needed for many different codecs OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o OBJS-$(CONFIG_AC3DSP) += ac3dsp.o diff --git a/libavcodec/file_open.c b/libavcodec/file_open.c new file mode 100644 index 0000000..494a5d3 --- a/dev/null +++ b/libavcodec/file_open.c @@ -0,0 +1 @@ +#include "libavutil/file_open.c" diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 340e0f1..1c6a463 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 0000000..494a5d3 --- a/dev/null +++ b/libavdevice/file_open.c @@ -0,0 +1 @@ +#include "libavutil/file_open.c" diff --git a/libavformat/Makefile b/libavformat/Makefile index b8872b3..4422a98 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -24,6 +24,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 diff --git a/libavformat/file_open.c b/libavformat/file_open.c new file mode 100644 index 0000000..494a5d3 --- a/dev/null +++ b/libavformat/file_open.c @@ -0,0 +1 @@ +#include "libavutil/file_open.c" diff --git a/libavutil/internal.h b/libavutil/internal.h index 4afc2db..9df2dd1 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -202,6 +202,10 @@ void avpriv_report_missing_feature(void *avc, void avpriv_request_sample(void *avc, const char *msg, ...) av_printf_format(2, 3); +#if HAVE_MSVCRT +#define avpriv_open ff_open +#endif + /** * A wrapper for open() setting O_CLOEXEC. */ |