diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:07:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:07:27 +0100 |
| commit | 9ea65c65f70029896b1c23afd9925ae42c4d009f (patch) | |
| tree | 213694091e2eb5a1480ca8427649f8be51be0a17 /configure | |
| parent | 06af724c56c9fd74bb6ace457f39e1768bd94246 (diff) | |
| parent | 0eecafc948b74c247ebbc59f18f508db5d590d0b (diff) | |
Merge commit '0eecafc948b74c247ebbc59f18f508db5d590d0b'
* commit '0eecafc948b74c247ebbc59f18f508db5d590d0b':
configure: Make the new srtp protocol depend on the rtp protocol
lavf: Add a fate test for the SRTP functions
lavu: Add a fate test for the HMAC API
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1966,6 +1966,7 @@ rtmpts_protocol_select="ffrtmphttp_protocol https_protocol" rtp_protocol_select="udp_protocol" sctp_protocol_deps="struct_sctp_event_subscribe" sctp_protocol_select="network" +srtp_protocol_select="rtp_protocol" tcp_protocol_select="network" tls_protocol_deps_any="openssl gnutls" tls_protocol_select="tcp_protocol" |