Merge commit '0eecafc948b74c247ebbc59f18f508db5d590d0b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Jan 2013 11:07:04 +0000 (12:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Jan 2013 11:07:27 +0000 (12:07 +0100)
commit9ea65c65f70029896b1c23afd9925ae42c4d009f
tree213694091e2eb5a1480ca8427649f8be51be0a17
parent06af724c56c9fd74bb6ace457f39e1768bd94246
parent0eecafc948b74c247ebbc59f18f508db5d590d0b
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>
configure
libavformat/Makefile
libavformat/srtp.c
libavutil/Makefile
libavutil/hmac.c
tests/fate/libavutil.mak