From 0f5b0b4178b844fcab82222109d0be00ab73c185 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 29 Jan 2013 18:00:34 +0100 Subject: [PATCH 1/2] avisynth: Change demuxer name to avoid conflicts with AVS --- libavformat/avisynth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index d31c427646..eb5e7adffd 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -219,7 +219,7 @@ static int avisynth_read_seek(AVFormatContext *s, int stream_index, int64_t pts, } AVInputFormat ff_avisynth_demuxer = { - .name = "avs", + .name = "avisynth", .long_name = NULL_IF_CONFIG_SMALL("AVISynth"), .priv_data_size = sizeof(AVISynthContext), .read_header = avisynth_read_header, From 29f1fa74225e9fdbab6d590857edbecb51cf74da Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 31 Jan 2013 00:43:18 +0100 Subject: [PATCH 2/2] configure: Move newlib libc check before mingw libc check On Cygwin systems MinGW headers can be present if the corresponding packages have been installed. Since the MinGW libc is checked for first, this results in newlib getting misdetected as MinGW libc. --- configure | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 77600ef2b5..c41a396f3e 100755 --- a/configure +++ b/configure @@ -3041,15 +3041,16 @@ if check_cpp_condition features.h "defined __UCLIBC__"; then elif check_cpp_condition features.h "defined __GLIBC__"; then libc_type=glibc add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 +# MinGW headers can be installed on Cygwin, so check for newlib first. +elif check_cpp_condition newlib.h "defined _NEWLIB_VERSION"; then + libc_type=newlib + add_cppflags -U__STRICT_ANSI__ elif check_header _mingw.h; then libc_type=mingw 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." -elif check_cpp_condition newlib.h "defined _NEWLIB_VERSION"; then - libc_type=newlib - add_cppflags -U__STRICT_ANSI__ elif check_func_headers stdlib.h _get_doserrno; then libc_type=msvcrt add_compat strtod.o strtod=avpriv_strtod