Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 19:52:14 +0000 (20:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 19:52:14 +0000 (20:52 +0100)
* commit 'd64341e498fa46c6cf4c23d408177d7489559654':
  configure: Prefix libc-related variables with "libc_"

Conflicts:
libavdevice/Makefile
libavformat/Makefile

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

diff --cc configure
+++ b/configure
@@@ -1538,8 -1331,8 +1538,9 @@@ HAVE_LIST=
      inline_asm_labels
      isatty
      jack_port_get_latency_range
 +    kbhit
      ldbrx
+     libc_msvcrt
      libdc1394_1
      libdc1394_2
      local_aligned_16
      mm_empty
      mmap
      mprotect
-     msvcrt
      nanosleep
 +    openjpeg_1_5_openjpeg_h
 +    PeekNamedPipe
 +    perl
 +    pod2man
      poll_h
      posix_memalign
      pragma_deprecated
@@@ -26,13 -23,8 +26,11 @@@ 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
@@@ -808,14 -675,9 +806,15 @@@ OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF
  OBJS-$(CONFIG_TEXT2MOVSUB_BSF)            += movsub_bsf.o
  
  # thread libraries
+ OBJS-$(HAVE_LIBC_MSVCRT)               += file_open.o
  OBJS-$(HAVE_PTHREADS)                  += pthread.o pthread_slice.o pthread_frame.o
  OBJS-$(HAVE_W32THREADS)                += pthread.o pthread_slice.o pthread_frame.o
 +OBJS-$(HAVE_OS2THREADS)                += pthread.o pthread_slice.o pthread_frame.o
 +
 +OBJS-$(CONFIG_FRAME_THREAD_ENCODER)    += frame_thread_encoder.o
 +
 +# Windows resource file
 +SLIBOBJS-$(HAVE_GNU_WINDRES)           += avcodecres.o
  
  SKIPHEADERS                            += %_tablegen.h                  \
                                            %_tables.h                    \
@@@ -10,11 -7,9 +10,9 @@@ 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
@@@ -51,13 -29,8 +49,15 @@@ OBJS-$(CONFIG_XV_OUTDEV
  OBJS-$(CONFIG_LIBCDIO_INDEV)             += libcdio.o
  OBJS-$(CONFIG_LIBDC1394_INDEV)           += libdc1394.o
  
+ OBJS-$(HAVE_LIBC_MSVCRT)                 += file_open.o
 +# Windows resource file
 +SLIBOBJS-$(HAVE_GNU_WINDRES)             += avdeviceres.o
 +
 +SKIPHEADERS-$(CONFIG_DSHOW_INDEV)        += dshow_capture.h
 +SKIPHEADERS-$(CONFIG_LIBPULSE)           += pulse_audio_common.h
 +SKIPHEADERS-$(CONFIG_V4L2_INDEV)         += v4l2-common.h
 +SKIPHEADERS-$(CONFIG_V4L2_OUTDEV)        += v4l2-common.h
  SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H)     += alsa-audio.h
  SKIPHEADERS-$(HAVE_SNDIO_H)              += sndio_common.h
  
@@@ -467,11 -386,13 +465,13 @@@ OBJS-$(CONFIG_TLS_PROTOCOL
  OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
  OBJS-$(CONFIG_UNIX_PROTOCOL)             += unix.o
  
+ OBJS-$(HAVE_LIBC_MSVCRT)                 += file_open.o
 +# Windows resource file
 +SLIBOBJS-$(HAVE_GNU_WINDRES)             += avformatres.o
 +
  SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h
  SKIPHEADERS-$(CONFIG_NETWORK)            += network.h rtsp.h
 -
 -EXAMPLES  = metadata                                                    \
 -
  TESTPROGS = seek                                                        \
              srtp                                                        \
              url                                                         \
Simple merge