2 Commits

Author	SHA1	Message	Date
Michael Niedermayer	b52925d2cd	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>	2013-01-15 16:05:34 +01:00
Martin Storsjö	2f3bada63e	lavf: Add a protocol for SRTP encryption/decryption ... This is mostly useful for encryption together with the RTP muxer, but could also be set up as IO towards the peer with the SDP demuxer with custom IO. Signed-off-by: Martin Storsjö <martin@martin.st>	2013-01-15 11:55:10 +02:00