diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:03:14 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:03:14 +0200 |
commit | 36e7a20e695b376287310d602b44d6719f82a021 (patch) | |
tree | 75070d702043e875c947fccaa2de7a419331de22 /configure | |
parent | 70fb003a9f2d9dc764e320f3ca64b0af1c68fdfb (diff) | |
parent | 93abb4f09229730c30e5bbdd6c54d4b981995eee (diff) | |
download | mpv-36e7a20e695b376287310d602b44d6719f82a021.tar.bz2 mpv-36e7a20e695b376287310d602b44d6719f82a021.tar.xz |
Merge svn changes up to r30550
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -6833,7 +6833,7 @@ if test "$_real" = auto ; then _real=no _res_comment="dynamic loader support needed" if test "$_dl" = yes || test "$_win32dll" = yes && - (linux || freebsd || netbsd || openbsd || dragonfly || darwin || win32) ; then + (linux || freebsd || netbsd || openbsd || dragonfly || darwin || win32 || os2) ; then _real=yes fi fi @@ -6946,7 +6946,7 @@ if test "$_libavutil" = auto ; then _libavutil=no cat > $TMPC << EOF #include <libavutil/common.h> -int main(void) { av_gcd(1,1); return 0; } +int main(void) { av_clip(1, 1, 1); return 0; } EOF if $_pkg_config --exists libavutil ; then _inc_libavutil=$($_pkg_config --cflags libavutil) @@ -8226,23 +8226,15 @@ $def_winsock2_h /* system functions */ -$def_exp2 -$def_exp2f $def_gethostbyname2 $def_gettimeofday $def_glob $def_langinfo -$def_llrint -$def_log2 -$def_log2f -$def_lrint $def_lrintf $def_map_memalign $def_memalign $def_nanosleep $def_posix_select -$def_round -$def_roundf $def_select $def_setenv $def_shm @@ -8252,7 +8244,6 @@ $def_sysi86 $def_sysi86_iv $def_termcap $def_termios -$def_truncf $def_vsscanf @@ -8260,6 +8251,7 @@ $def_vsscanf $def_asmalign_pot $def_builtin_expect $def_dl +$def_dos_paths $def_extern_asm $def_extern_prefix $def_iconv @@ -8531,16 +8523,24 @@ $def_arpa_inet_h $def_bswap $def_bzlib $def_dcbzl -$def_dos_paths +$def_exp2 +$def_exp2f $def_fast_64bit $def_fast_unaligned +$def_llrint +$def_log2 +$def_log2f +$def_lrint $def_memalign_hack $def_mlib $def_mkstemp $def_posix_memalign $def_pthreads +$def_round +$def_roundf $def_ten_operands $def_threads +$def_truncf $def_xform_asm $def_yasm |