diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-28 00:42:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-28 01:08:52 +0200 |
| commit | 87df986dcf90dcda2d10d9c3b3c84656cdd032aa (patch) | |
| tree | f7c506a9a96b3df41f392a558a1f9add4f9ff013 /configure | |
| parent | ee7214c59a2641389bec9e9598345c7a58f1e173 (diff) | |
| parent | 15358ade152ebc28fcc824e09ad9206597c281df (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mss1: validate number of changeable palette entries
mss1: report palette changed when some additional colours were decoded
x86: fft: replace call to memcpy by a loop
udp: Support IGMPv3 source specific multicast and source blocking
dxva2: include dxva.h if found
libm: Provide fallback definitions for isnan() and isinf()
tcp: Pass NULL as hostname to getaddrinfo if the string is empty
tcp: Set AI_PASSIVE when the socket will be used for listening
Conflicts:
configure
libavcodec/mss1.c
libavformat/udp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -1192,6 +1192,7 @@ HAVE_LIST=" dlfcn_h dlopen dos_paths + dxva_h ebp_available ebx_available exp2 @@ -1215,6 +1216,8 @@ HAVE_LIST=" inet_aton inline_asm isatty + isinf + isnan jack_port_get_latency_range kbhit ldbrx @@ -1259,6 +1262,8 @@ HAVE_LIST=" strerror_r strptime struct_addrinfo + struct_group_source_req + struct_ip_mreq_source struct_ipv6_mreq struct_rusage_ru_maxrss struct_sockaddr_in6 @@ -3116,6 +3121,8 @@ fi if enabled network; then check_type "sys/types.h sys/socket.h" socklen_t check_type netdb.h "struct addrinfo" + check_type netinet/in.h "struct group_source_req" -D_BSD_SOURCE + check_type netinet/in.h "struct ip_mreq_source" -D_BSD_SOURCE check_type netinet/in.h "struct ipv6_mreq" -D_DARWIN_C_SOURCE check_type netinet/in.h "struct sockaddr_in6" check_type "sys/types.h sys/socket.h" "struct sockaddr_storage" @@ -3131,6 +3138,8 @@ if enabled network; then network_extralibs="-lws2_32"; } check_type ws2tcpip.h socklen_t check_type ws2tcpip.h "struct addrinfo" + check_type ws2tcpip.h "struct group_source_req" + check_type ws2tcpip.h "struct ip_mreq_source" check_type ws2tcpip.h "struct ipv6_mreq" check_type ws2tcpip.h "struct sockaddr_in6" check_type ws2tcpip.h "struct sockaddr_storage" @@ -3180,6 +3189,7 @@ check_func_headers windows.h VirtualAlloc check_func_headers glob.h glob check_header dlfcn.h +check_header dxva.h check_header dxva2api.h -D_WIN32_WINNT=0x0600 check_header libcrystalhd/libcrystalhd_if.h check_header malloc.h @@ -3250,6 +3260,8 @@ 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 |