* 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>
This supports HMAC-MD5 and HMAC-SHA1 for now, other hashes are simple to add. Signed-off-by: Martin Storsjö <martin@martin.st>