summaryrefslogtreecommitdiff
path: root/libavformat/srtpproto.c
Commit message (Expand)AuthorAge
* Merge commit 'f2c614e8c4a935b52bbf86819128d9e797230c20'Michael Niedermayer2014-12-18
|\
| * srtpproto: fix option flag typeTristan Matthews2014-12-18
* | 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