Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Jan 2013 14:56:12 +0000 (15:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Jan 2013 14:57:33 +0000 (15:57 +0100)
commite7e0186eeb0a0aa1e2ca805b97eb60cbd14e0567
treeb19a7ab7351615a21aa0ac7d57c7a486f7318e5b
parente074fe2962df5a43ac41f26b2180094057600cc5
parentab2ad8bd56882c0ea160b154e8b836eb71abc49d
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>
doc/APIchanges
libavformat/srtp.c
libavformat/srtp.h
libavutil/Makefile
libavutil/hmac.c
libavutil/hmac.h
libavutil/version.h