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>

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

libavcodec/file_open.c

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

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

libavdevice/file_open.c

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

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

libavformat/file_open.c

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

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.
  */