diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-15 12:10:08 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-15 12:10:08 +0100 |
commit | 61fbb4cd57d7bd280c6645df98acdacfe6004a88 (patch) | |
tree | 52c35fd93bdfc3b30d6b284e59e9362131b49962 /configure | |
parent | 75758f84def252a228a80a2e08d0c9ed7fce8df4 (diff) | |
parent | 4db96649ca700db563d9da4ebe70bf9fc4c7a6ba (diff) | |
download | ffmpeg-streaming-61fbb4cd57d7bd280c6645df98acdacfe6004a88.zip ffmpeg-streaming-61fbb4cd57d7bd280c6645df98acdacfe6004a88.tar.gz |
Merge commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba'
* commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba':
avutil: Ensure that emms_c is always defined, even on non-x86
configure: Move MinGW CPPFLAGS setting to libc section, where it belongs
avutil: Move emms code to x86-specific header
Conflicts:
configure
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3226,7 +3226,6 @@ case $target_os in objformat="win32" ranlib=: enable dos_paths - add_cppflags -U__STRICT_ANSI__ ;; win32|win64) if enabled shared; then @@ -3370,6 +3369,7 @@ elif check_header _mingw.h; then "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__ if check_cpp_condition _mingw.h "defined(__MINGW64_VERSION_MAJOR) && \ __MINGW64_VERSION_MAJOR < 3"; then add_compat msvcrt/snprintf.o |