virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Merge commit '29f1fa74225e9fdbab6d590857edbecb51cf74da'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-01-31 19:52:58 +01:00
commit 01d012ba3d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -3353,6 +3353,10 @@ if check_cpp_condition features.h "defined __UCLIBC__"; then
elif check_cpp_condition features.h "defined __GLIBC__"; then elif check_cpp_condition features.h "defined __GLIBC__"; then
libc_type=glibc libc_type=glibc
add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 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 elif check_header _mingw.h; then
libc_type=mingw libc_type=mingw
check_cpp_condition _mingw.h \ check_cpp_condition _mingw.h \
@ -3364,9 +3368,6 @@ elif check_header _mingw.h; then
add_compat msvcrt/snprintf.o add_compat msvcrt/snprintf.o
add_cflags "-include $source_path/compat/msvcrt/snprintf.h" add_cflags "-include $source_path/compat/msvcrt/snprintf.h"
fi 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 elif check_func_headers stdlib.h _get_doserrno; then
libc_type=msvcrt libc_type=msvcrt
add_compat strtod.o strtod=avpriv_strtod add_compat strtod.o strtod=avpriv_strtod

2
libavformat/avisynth.c
View File

@ -226,7 +226,7 @@ static int avisynth_read_seek(AVFormatContext *s, int stream_index, int64_t pts,
} }
AVInputFormat ff_avisynth_demuxer = { AVInputFormat ff_avisynth_demuxer = {
.name = "avs", .name = "avisynth",
.long_name = NULL_IF_CONFIG_SMALL("AVISynth"), .long_name = NULL_IF_CONFIG_SMALL("AVISynth"),
.priv_data_size = sizeof(AVISynthContext), .priv_data_size = sizeof(AVISynthContext),
.read_header = avisynth_read_header, .read_header = avisynth_read_header,