Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Oct 2012 11:57:10 +0000 (13:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Oct 2012 11:57:10 +0000 (13:57 +0200)
* commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d':
  rangecoder-test: Return in case of an error
  build: simplify enabling of compat objects

Conflicts:
configure
libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/rangecoder.c
libavutil/Makefile

diff --cc configure
+++ b/configure
@@@ -1269,12 -1136,9 +1275,11 @@@ HAVE_LIST=
      arpa_inet_h
      asm_mod_q
      asm_mod_y
 +    asm_types_h
      attribute_may_alias
      attribute_packed
-     broken_snprintf
      cbrtf
 +    clock_gettime
      closesocket
      cmov
      cpunop
@@@ -3219,11 -2908,6 +3224,11 @@@ elif check_header _mingw.h; the
          "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."
-         enable broken_snprintf
 +    if check_cpp_condition _mingw.h "defined(__MINGW64_VERSION_MAJOR) && \
 +            __MINGW64_VERSION_MAJOR < 3"; then
++        add_compat msvcrt/snprintf.o
 +        add_cflags "-include $source_path/compat/msvcrt/snprintf.h"
 +    fi
  elif check_cpp_condition newlib.h "defined _NEWLIB_VERSION"; then
      libc_type=newlib
  elif check_func_headers stdlib.h _get_doserrno; then
@@@ -4242,7 -3759,8 +4246,8 @@@ CFLAGS-ffplay=$sdl_cflag
  ZLIB=$($ldflags_filter -lz)
  LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
  EXTRALIBS=$extralibs
 -INSTALL=install
+ COMPAT_OBJS=$compat_objs
 +INSTALL=$install
  LIBTARGET=${LIBTARGET}
  SLIBNAME=${SLIBNAME}
  SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}
Simple merge
@@@ -90,15 -84,11 +90,14 @@@ OBJS = adler32.
         samplefmt.o                                                      \
         sha.o                                                            \
         time.o                                                           \
 +       timecode.o                                                       \
         tree.o                                                           \
         utils.o                                                          \
 +       xga_font_data.o                                                  \
         xtea.o                                                           \
  
- OBJS-$(HAVE_BROKEN_SNPRINTF) += ../compat/msvcrt/snprintf.o
 +
- OBJS-$(HAVE_MSVCRT) += ../compat/strtod.o
+ OBJS += $(COMPAT_OBJS:%=../compat/%)
  
  SKIPHEADERS          = old_pix_fmts.h