Merge commit '0db2d94280e260af5f3ad7993c5a6357462f17c9'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Sep 2012 14:05:40 +0000 (16:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Sep 2012 14:05:40 +0000 (16:05 +0200)
* commit '0db2d94280e260af5f3ad7993c5a6357462f17c9':
  dsputil: workaround __VA_ARGS__ missing tokenization for MSVC
  configure: add section for libc-specific hacks
  build: disable ranlib on mingw
  parser: Don't use pc as context for av_dlog
  h264: Remove an assert on current_picture_ptr being null

Conflicts:
configure
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/dsputil.h
libavcodec/h264.c

diff --cc configure
+++ b/configure
@@@ -3022,11 -2706,10 +3022,9 @@@ case $target_os i
          SLIB_INSTALL_EXTRA_LIB='lib$(SLIBNAME:$(SLIBSUF)=.dll.a) $(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.def)'
          SHFLAGS='-shared -Wl,--output-def,$$(@:$(SLIBSUF)=.def) -Wl,--out-implib,$(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base'
          objformat="win32"
 -        dlltool="${cross_prefix}dlltool"
+         ranlib=:
          enable dos_paths
          check_cflags -fno-common
-         check_cpp_condition _mingw.h "defined (__MINGW64_VERSION_MAJOR) || (__MINGW32_MAJOR_VERSION > 3) \
-                                       || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
-                 die "ERROR: MinGW runtime version must be >= 3.15."
          add_cppflags -U__STRICT_ANSI__
          ;;
      cygwin*)
Simple merge
Simple merge