RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
51,085 Commits 36 Branches 398 Tags 225 MiB
Commit Graph

4 Commits

Author SHA1 Message Date
Michael Niedermayer 9ea65c65f7 Merge commit '0eecafc948b74c247ebbc59f18f508db5d590d0b' 
* commit '0eecafc948b74c247ebbc59f18f508db5d590d0b':
  configure: Make the new srtp protocol depend on the rtp protocol
  lavf: Add a fate test for the SRTP functions
  lavu: Add a fate test for the HMAC API

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-16 12:07:27 +01:00
Martin Storsjö 3130fa51a5 lavu: Add a fate test for the HMAC API 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-15 23:18:07 +02:00
Michael Niedermayer e7e0186eeb Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d' 
* commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d':
  lavf: Add functions for SRTP decryption/encryption
  lavu: Add an API for calculating HMAC (RFC 2104)

Conflicts:
	doc/APIchanges
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-15 15:57:33 +01:00
Martin Storsjö 8ee288d258 lavu: Add an API for calculating HMAC (RFC 2104) 
This supports HMAC-MD5 and HMAC-SHA1 for now, other hashes are
simple to add.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-15 11:54:19 +02:00