generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  libavutil: Make avpriv_open a library-internal function on msvcrt

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-10 10:41:46 +02:00
commit b37ff488b8
7 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/Makefile
View File

@ -31,6 +31,8 @@ OBJS = allcodecs.o \
resample2.o \ resample2.o \
utils.o \ utils.o \
OBJS-$(HAVE_MSVCRT) += file_open.o
# parts needed for many different codecs # parts needed for many different codecs
OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o
OBJS-$(CONFIG_AC3DSP) += ac3dsp.o OBJS-$(CONFIG_AC3DSP) += ac3dsp.o

1
libavcodec/file_open.c Normal file
View File

@ -0,0 +1 @@
#include "libavutil/file_open.c"

2
libavdevice/Makefile
View File

@ -10,6 +10,8 @@ HEADERS = avdevice.h \
OBJS = alldevices.o \ OBJS = alldevices.o \
avdevice.o \ avdevice.o \
OBJS-$(HAVE_MSVCRT) += file_open.o
# input/output devices # input/output devices
OBJS-$(CONFIG_ALSA_INDEV) += alsa-audio-common.o \ OBJS-$(CONFIG_ALSA_INDEV) += alsa-audio-common.o \
alsa-audio-dec.o timefilter.o alsa-audio-dec.o timefilter.o

1
libavdevice/file_open.c Normal file
View File

@ -0,0 +1 @@
#include "libavutil/file_open.c"

2
libavformat/Makefile
View File

@ -24,6 +24,8 @@ OBJS = allformats.o \
url.o \ url.o \
utils.o \ utils.o \
OBJS-$(HAVE_MSVCRT) += file_open.o
OBJS-$(CONFIG_NETWORK) += network.o OBJS-$(CONFIG_NETWORK) += network.o
OBJS-$(CONFIG_RIFFDEC) += riffdec.o OBJS-$(CONFIG_RIFFDEC) += riffdec.o
OBJS-$(CONFIG_RIFFENC) += riffenc.o OBJS-$(CONFIG_RIFFENC) += riffenc.o

1
libavformat/file_open.c Normal file
View File

@ -0,0 +1 @@
#include "libavutil/file_open.c"

4
libavutil/internal.h
View File

@ -202,6 +202,10 @@ void avpriv_report_missing_feature(void *avc,
void avpriv_request_sample(void *avc, void avpriv_request_sample(void *avc,
const char *msg, ...) av_printf_format(2, 3); const char *msg, ...) av_printf_format(2, 3);
#if HAVE_MSVCRT
#define avpriv_open ff_open
#endif
/** /**
* A wrapper for open() setting O_CLOEXEC. * A wrapper for open() setting O_CLOEXEC.
*/ */