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>

diff --cc libavcodec/Makefile
index b6b4263679b7eb2fba73e04f34628e2f310d5753,318ed7db2af093d6e859bd2121a123924943a847..5c8f9d5ed5d23f114eea93d64a9456e5329850df
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -26,11 -24,10 +26,13 @@@ OBJS = allcodecs.
         options.o                                                        \
         parser.o                                                         \
         raw.o                                                            \
 +       rawdec.o                                                         \
 +       resample.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 --cc libavdevice/Makefile
index 340e0f1927417e0dc6b71130ec15d41c460f5655,8fdae2d44e1b4c36079f564bfbbf91ed4c8968eb..1c6a463c6a05cb0102fb3b2c065708b71268ae82
--- 1/libavdevice/Makefile
--- 2/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@@ -10,9 -7,11 +10,11 @@@ HEADERS = avdevice.
  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
 +                                            alsa-audio-dec.o timefilter.o
  OBJS-$(CONFIG_ALSA_OUTDEV)               += alsa-audio-common.o \
                                              alsa-audio-enc.o
  OBJS-$(CONFIG_BKTR_INDEV)                += bktr.o

diff --cc libavformat/Makefile
Simple merge

diff --cc libavutil/internal.h
Simple merge