ffmpeg/libavutil
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
..
2012-10-28 14:33:41 +01:00
2012-10-28 14:33:41 +01:00
2012-07-16 19:30:13 +00:00
2012-04-20 09:43:11 -04:00
2012-12-05 20:25:32 +01:00
2013-01-02 23:15:45 +01:00
2012-10-31 17:01:52 +01:00
2012-08-09 01:44:15 +02:00
2012-10-28 14:33:41 +01:00
2012-12-08 01:34:28 +01:00
2012-10-06 14:03:15 +02:00
2012-11-23 18:10:02 +01:00
2012-10-28 14:33:41 +01:00
2012-10-31 03:10:35 +01:00
2012-10-28 14:33:41 +01:00
2013-01-05 16:25:37 +01:00