diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-16 20:45:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-16 20:45:41 +0200 |
| commit | 9db747b2a300380dd65032818155067054332dae (patch) | |
| tree | 72d665b0be4eb133524bb21fb4a66a4b30dfb0cb /configure | |
| parent | 5dba4cbc2f3f64b188289804216a737528ced290 (diff) | |
| parent | 08e087ccf7f7ef9b4e8c55b571bc779c0bc815b0 (diff) | |
| download | ffmpeg-9db747b2a300380dd65032818155067054332dae.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: rtmp_parse_result() add case for video and audio packets to avoid undesired debug output.
configure: Move the getaddrinfo function check into the network block
configure: Remove an unused 'have' item
mpeg: remove disabled code
libfdk-aac: Check if cutoff value is valid
network: Always use our version of gai_strerror on windows
network: Undefine existing gai_strerror definitions
network: Extend the fallback gai_strerror implementation to handle more error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1190,7 +1190,6 @@ HAVE_LIST=" clock_gettime closesocket cmov - CommandLineToArgvW cpuid dcbzl dev_bktr_ioctl_bt848_h @@ -3155,6 +3154,7 @@ if enabled network; then check_type "sys/types.h sys/socket.h" "struct sockaddr_storage" check_struct "sys/types.h sys/socket.h" "struct sockaddr" sa_len check_header netinet/sctp.h + check_func getaddrinfo $network_extralibs # Prefer arpa/inet.h over winsock2 if check_header arpa/inet.h ; then check_func closesocket @@ -3163,6 +3163,7 @@ if enabled network; then network_extralibs="-lws2" || \ { check_func_headers winsock2.h closesocket -lws2_32 && \ network_extralibs="-lws2_32"; } + check_func_headers ws2tcpip.h getaddrinfo $network_extralibs check_type ws2tcpip.h socklen_t check_type ws2tcpip.h "struct addrinfo" check_type ws2tcpip.h "struct group_source_req" @@ -3183,8 +3184,6 @@ check_func nanosleep || { check_func nanosleep -lrt && add_extralibs -lrt; } check_func clock_gettime || { check_func clock_gettime -lrt && add_extralibs -lrt; } check_func fcntl check_func fork -check_func getaddrinfo $network_extralibs || - check_func_headers ws2tcpip.h getaddrinfo $network_extralibs check_func gethrtime check_func getopt check_func getrusage |