diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-20 13:18:59 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-20 13:18:59 +0200 |
commit | 6912e7a008acd1464a63b0a00779a3de81b9a8ab (patch) | |
tree | 67af44d73c8fa23fb60f92898067a98dce3e2390 /configure | |
parent | 04c6ecb7da677049cd52efe2a980e586167e9e5d (diff) | |
parent | 79042ab37619a234d5fe0f680885a392e966ea6b (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Group math functions into a separate variable
avutil/mem: K&R formatting cosmetics
avutil/lzo: K&R formatting cosmetics
Conflicts:
configure
libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 55 |
1 files changed, 23 insertions, 32 deletions
@@ -1263,6 +1263,25 @@ HAVE_LIST_PUB=' incompatible_fork_abi ' +MATH_FUNCS=" + cbrtf + exp2 + exp2f + isinf + isnan + llrint + llrintf + log2 + log2f + lrint + lrintf + rint + round + roundf + trunc + truncf +" + HAVE_LIST=" $ARCH_EXT_LIST $(add_suffix _external $ARCH_EXT_LIST) @@ -1270,6 +1289,7 @@ HAVE_LIST=" $HAVE_LIST_CMDLINE $HAVE_LIST_PUB $THREADS_LIST + $MATH_FUNCS aligned_malloc aligned_stack alsa_asoundlib_h @@ -1280,7 +1300,6 @@ HAVE_LIST=" asm_types_h attribute_may_alias attribute_packed - cbrtf clock_gettime closesocket cmov @@ -1299,8 +1318,6 @@ HAVE_LIST=" dxva_h ebp_available ebx_available - exp2 - exp2f fast_64bit fast_clz fast_cmov @@ -1321,23 +1338,15 @@ HAVE_LIST=" inet_aton io_h isatty - isinf - isnan jack_port_get_latency_range kbhit ldbrx libdc1394_1 libdc1394_2 - llrint - llrintf local_aligned_16 local_aligned_8 localtime_r - log2 - log2f loongson - lrint - lrintf lzo1x_999_compress machine_ioctl_bt848_h machine_ioctl_meteor_h @@ -1358,9 +1367,6 @@ HAVE_LIST=" posix_memalign pthread_cancel rdtsc - rint - round - roundf sched_getaffinity sdl sdl_video_size @@ -1396,8 +1402,6 @@ HAVE_LIST=" termios_h texi2html threads - trunc - truncf unistd_h usleep vfp_args @@ -3615,22 +3619,9 @@ check_lib math.h sin -lm && LIBM="-lm" disabled crystalhd || check_lib libcrystalhd/libcrystalhd_if.h DtsCrystalHDVersion -lcrystalhd || disable crystalhd enabled vaapi && require vaapi va/va.h vaInitialize -lva -check_mathfunc cbrtf -check_mathfunc exp2 -check_mathfunc exp2f -check_mathfunc isinf -check_mathfunc isnan -check_mathfunc llrint -check_mathfunc llrintf -check_mathfunc log2 -check_mathfunc log2f -check_mathfunc lrint -check_mathfunc lrintf -check_mathfunc rint -check_mathfunc round -check_mathfunc roundf -check_mathfunc trunc -check_mathfunc truncf +for func in $MATH_FUNCS; do + check_mathfunc $func +done # these are off by default, so fail if requested and not available enabled avisynth && require2 vfw32 "windows.h vfw.h" AVIFileInit -lavifil32 |