summaryrefslogtreecommitdiff
path: root/libavformat/srtpproto.c
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-09
|\
| * lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500Andrew Van Til2013-04-09
* | Merge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05'Michael Niedermayer2013-01-15
|/
* lavf: Add a protocol for SRTP encryption/decryptionMartin Storsjö2013-01-15