[FFmpeg-cvslog] Merge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 15 16:05:00 2013 +0100| [b52925d2cde98b2a3ffaf451248191c8627d356a] | committer: Michael Niedermayer

Merge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05'

* commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05':
  lavf: Add a protocol for SRTP encryption/decryption
  rtsp: Support decryption of SRTP signalled via RFC 4568 (SDES)

Conflicts:
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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