[FFmpeg-cvslog] Merge commit '0eecafc948b74c247ebbc59f18f508db5d590d0b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 16 12:07:04 2013 +0100| [9ea65c65f70029896b1c23afd9925ae42c4d009f] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ea65c65f70029896b1c23afd9925ae42c4d009f
---