summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2018-09-02 16:50:45 -0300
committerJames Almer <jamrial@gmail.com>2018-09-02 16:50:45 -0300
commit41cd5af3250ef976f0a48adeb6dbccc9b2683e58 (patch)
tree686a0f820024fa053eab6e6c2899a6c9a40fb92e /configure
parent4069096dd535ee99175c2a29c1a1f59c3fc110c1 (diff)
parent23be4eebf8aaa7519b12b2a49e5c5c6c4d076e6a (diff)
Merge commit '23be4eebf8aaa7519b12b2a49e5c5c6c4d076e6a'
* commit '23be4eebf8aaa7519b12b2a49e5c5c6c4d076e6a': build: Group external library protocols separately Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure22
1 files changed, 12 insertions, 10 deletions
diff --git a/configure b/configure
index d2df05fa55..9d10912120 100755
--- a/configure
+++ b/configure
@@ -3288,18 +3288,8 @@ httpproxy_protocol_suggest="zlib"
https_protocol_select="tls_protocol"
https_protocol_suggest="zlib"
icecast_protocol_select="http_protocol"
-librtmp_protocol_deps="librtmp"
-librtmpe_protocol_deps="librtmp"
-librtmps_protocol_deps="librtmp"
-librtmpt_protocol_deps="librtmp"
-librtmpte_protocol_deps="librtmp"
-libsmbclient_protocol_deps="libsmbclient gplv3"
-libssh_protocol_deps="libssh"
-libtls_conflict="openssl gnutls mbedtls"
mmsh_protocol_select="http_protocol"
mmst_protocol_select="network"
-libsrt_protocol_deps="libsrt"
-libsrt_protocol_select="network"
rtmp_protocol_conflict="librtmp_protocol"
rtmp_protocol_select="tcp_protocol"
rtmp_protocol_suggest="zlib"
@@ -3328,6 +3318,18 @@ udplite_protocol_select="network"
unix_protocol_deps="sys_un_h"
unix_protocol_select="network"
+# external library protocols
+librtmp_protocol_deps="librtmp"
+librtmpe_protocol_deps="librtmp"
+librtmps_protocol_deps="librtmp"
+librtmpt_protocol_deps="librtmp"
+librtmpte_protocol_deps="librtmp"
+libsmbclient_protocol_deps="libsmbclient gplv3"
+libsrt_protocol_deps="libsrt"
+libsrt_protocol_select="network"
+libssh_protocol_deps="libssh"
+libtls_conflict="openssl gnutls mbedtls"
+
# filters
afftfilt_filter_deps="avcodec"
afftfilt_filter_select="fft"