diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 01:32:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 01:32:37 +0100 |
| commit | b7d8484f272b7a5a2ed9db76d5182dbd6e3e6992 (patch) | |
| tree | bcccbc78b279cd208a485fac81998118a415926e /configure | |
| parent | 78ac7ee97040a2e9a69b81f82a89edd779e124bb (diff) | |
| parent | b8f3ab8e6a7ce3627764da53b809628c828d4047 (diff) | |
Merge commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047'
* commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047':
ac3dec: output planar float only
svq3: make slice type value unsigned to match svq3_get_ue_golomb return type
configure: Have protocols select network code instead of depending on it
Conflicts:
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 16 |
1 files changed, 7 insertions, 9 deletions
@@ -1927,10 +1927,8 @@ ffrtmpcrypt_protocol_deps_any="gcrypt nettle openssl" ffrtmpcrypt_protocol_select="tcp_protocol" ffrtmphttp_protocol_deps="!librtmp_protocol" ffrtmphttp_protocol_select="http_protocol" -gopher_protocol_deps="network" -httpproxy_protocol_deps="network" +gopher_protocol_select="network" httpproxy_protocol_select="tcp_protocol" -http_protocol_deps="network" http_protocol_select="tcp_protocol" https_protocol_select="tls_protocol" librtmp_protocol_deps="librtmp" @@ -1939,7 +1937,7 @@ librtmps_protocol_deps="librtmp" librtmpt_protocol_deps="librtmp" librtmpte_protocol_deps="librtmp" mmsh_protocol_select="http_protocol" -mmst_protocol_deps="network" +mmst_protocol_select="network" rtmp_protocol_deps="!librtmp_protocol" rtmp_protocol_select="tcp_protocol" rtmpe_protocol_select="ffrtmpcrypt_protocol" @@ -1949,11 +1947,12 @@ rtmpt_protocol_select="ffrtmphttp_protocol" rtmpte_protocol_select="ffrtmpcrypt_protocol ffrtmphttp_protocol" rtmpts_protocol_select="ffrtmphttp_protocol https_protocol" rtp_protocol_select="udp_protocol" -sctp_protocol_deps="network struct_sctp_event_subscribe" -tcp_protocol_deps="network" +sctp_protocol_deps="struct_sctp_event_subscribe" +sctp_protocol_select="network" +tcp_protocol_select="network" tls_protocol_deps_any="openssl gnutls" tls_protocol_select="tcp_protocol" -udp_protocol_deps="network" +udp_protocol_select="network" # filters aconvert_filter_deps="swresample" @@ -2079,7 +2078,6 @@ enable stripping enable asm enable debug enable doc -enable network enable optimizations enable runtime_cpudetect enable safe_bitstream_reader @@ -3651,7 +3649,7 @@ elif check_func dlopen -ldl; then ldl=-ldl fi -if enabled network; then +if ! disabled 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 |