Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Aug 2013 08:41:46 +0000 (10:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Aug 2013 08:51:03 +0000 (10:51 +0200)
* qatar/master:
  libavutil: Make avpriv_open a library-internal function on msvcrt

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/Makefile
libavdevice/Makefile
libavformat/Makefile
libavutil/internal.h

@@@ -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
@@@ -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
Simple merge
Simple merge