diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-31 19:52:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-31 19:52:58 +0100 |
| commit | 01d012ba3db91d555b6905d21afcb232150b9ecf (patch) | |
| tree | d656893d72e6eda4f1e22cc89fed0869190c558b | |
| parent | 324498f824701ab0bc1f666269e073c8922703ca (diff) | |
| parent | 29f1fa74225e9fdbab6d590857edbecb51cf74da (diff) | |
| download | ffmpeg-01d012ba3db91d555b6905d21afcb232150b9ecf.tar.gz | |
Merge commit '29f1fa74225e9fdbab6d590857edbecb51cf74da'
* 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>
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | libavformat/avisynth.c | 2 |
2 files changed, 5 insertions, 4 deletions
@@ -3353,6 +3353,10 @@ 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 \ @@ -3364,9 +3368,6 @@ elif check_header _mingw.h; 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 - add_cppflags -U__STRICT_ANSI__ elif check_func_headers stdlib.h _get_doserrno; then libc_type=msvcrt add_compat strtod.o strtod=avpriv_strtod diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index e5d9b7626f..1e4dee1b00 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -226,7 +226,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, |