summaryrefslogtreecommitdiff
path: root/libavformat/srtp.c
Commit message (Expand)AuthorAge
* Merge commit '977d4a3b8a2dbc2fb5e747c7072485016c9cdfaa'Michael Niedermayer2013-01-16
|\
| * srtp: Mark a few variables as uninitializedMartin Storsjö2013-01-15
* | Merge commit '0eecafc948b74c247ebbc59f18f508db5d590d0b'Michael Niedermayer2013-01-16
|\|
| * lavf: Add a fate test for the SRTP functionsMartin Storsjö2013-01-15
* | Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d'Michael Niedermayer2013-01-15
|/
* lavf: Add functions for SRTP decryption/encryptionMartin Storsjö2013-01-15