summaryrefslogtreecommitdiff
path: root/libavformat/srtp.h
Commit message (Expand)AuthorAge
* Merge commit 'a2a991b2ddf951454ffceb7bcedc9db93e26c610'Michael Niedermayer2013-01-21
|\
| * srtp: Add support for a few DTLS-SRTP related crypto suitesMartin Storsjö2013-01-21
* | Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d'Michael Niedermayer2013-01-15
|/
* lavf: Add functions for SRTP decryption/encryptionMartin Storsjö2013-01-15