summaryrefslogtreecommitdiff
path: root/libavformat/srtpproto.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-09
|\ | | | | | | | | | | | | | | | | | | * qatar/master: srtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTH rtpdec: Increase max rtp packet size to 8192 lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500 h264pred: Add a few missing const declarations for ff_cropTbl derived pointers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500Andrew Van Til2013-04-09
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05'Michael Niedermayer2013-01-15
|/ | | | | | | | | | | * 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>
* lavf: Add a protocol for SRTP encryption/decryptionMartin Storsjö2013-01-15
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>