diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 19:05:00 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 19:05:34 +0400 |
| commit | b52925d2cde98b2a3ffaf451248191c8627d356a (patch) | |
| tree | b5bc13efa1c4f0151fb47fecf295935000c71dc7 /libavformat/allformats.c | |
| parent | e7e0186eeb0a0aa1e2ca805b97eb60cbd14e0567 (diff) | |
| parent | 2f3bada63e57345329c4f9b48e9b81b5cfc03d05 (diff) | |
Merge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05'
* commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05':
lavf: Add a protocol for SRTP encryption/decryption
rtsp: Support decryption of SRTP signalled via RFC 4568 (SDES)
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/allformats.c')
| -rw-r--r-- | libavformat/allformats.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 83094f95df..f49b436f50 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -327,6 +327,7 @@ void av_register_all(void) REGISTER_PROTOCOL(RTMPTS, rtmpts); REGISTER_PROTOCOL(RTP, rtp); REGISTER_PROTOCOL(SCTP, sctp); + REGISTER_PROTOCOL(SRTP, srtp); REGISTER_PROTOCOL(TCP, tcp); REGISTER_PROTOCOL(TLS, tls); REGISTER_PROTOCOL(UDP, udp); |