summaryrefslogtreecommitdiff
path: root/libavformat/srtp.c
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-091-2/+3
|\
| * srtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTHMartin Storsjö2013-04-091-0/+1
| * lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500Andrew Van Til2013-04-091-2/+2
* | Merge commit '8a4f26206d7914eaf2903954ce97cb7686933382'Michael Niedermayer2013-01-211-2/+34
|\ \ | |/
| * srtp: Move a variable to a local scopeMartin Storsjö2013-01-211-2/+2
| * srtp: Add tests for the crypto suite with 32/80 bit HMACMartin Storsjö2013-01-211-0/+32
* | Merge commit '3ef6d22e1ba544ab37c73e8fc61382f13aac250f'Michael Niedermayer2013-01-211-24/+14
|\ \ | |/
| * srtp: cosmetics: Use fewer lines for the test vectorsMartin Storsjö2013-01-211-22/+8
| * srtp: Don't require more input data than what actually is neededMartin Storsjö2013-01-211-2/+6
* | Merge commit 'a2a991b2ddf951454ffceb7bcedc9db93e26c610'Michael Niedermayer2013-01-211-15/+29
|\ \ | |/
| * srtp: Improve the minimum encryption buffer size checkMartin Storsjö2013-01-211-6/+10
| * srtp: Add support for a few DTLS-SRTP related crypto suitesMartin Storsjö2013-01-211-11/+21
* | Merge commit 'f53490cc0c809975f8238d5a9edbd26f83bd2f84'Michael Niedermayer2013-01-211-1/+14
|\ \ | |/
| * rtpdec/srtp: Handle CSRC fields being presentMartin Storsjö2013-01-211-1/+14
* | Merge commit '977d4a3b8a2dbc2fb5e747c7072485016c9cdfaa'Michael Niedermayer2013-01-161-2/+2
|\ \ | |/
| * srtp: Mark a few variables as uninitializedMartin Storsjö2013-01-151-2/+2
* | Merge commit '0eecafc948b74c247ebbc59f18f508db5d590d0b'Michael Niedermayer2013-01-161-0/+129
|\ \ | |/
| * lavf: Add a fate test for the SRTP functionsMartin Storsjö2013-01-151-0/+129
* | Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d'Michael Niedermayer2013-01-151-4/+4
|/
* lavf: Add functions for SRTP decryption/encryptionMartin Storsjö2013-01-151-0/+293