Merge commit '29f1fa74225e9fdbab6d590857edbecb51cf74da'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 31 Jan 2013 18:52:58 +0000 (19:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 31 Jan 2013 18:52:58 +0000 (19:52 +0100)
* commit '29f1fa74225e9fdbab6d590857edbecb51cf74da':
  configure: Move newlib libc check before mingw libc check
  avisynth: Change demuxer name to avoid conflicts with AVS

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavformat/avisynth.c

diff --cc configure
+++ b/configure
@@@ -3359,14 -3051,6 +3363,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."
- elif check_cpp_condition newlib.h "defined _NEWLIB_VERSION"; then
-     libc_type=newlib
-     add_cppflags -U__STRICT_ANSI__
 +    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_func_headers stdlib.h _get_doserrno; then
      libc_type=msvcrt
      add_compat strtod.o strtod=avpriv_strtod
Simple merge