Merge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Jan 2013 15:05:00 +0000 (16:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 15 Jan 2013 15:05:34 +0000 (16:05 +0100)
commitb52925d2cde98b2a3ffaf451248191c8627d356a
treeb5bc13efa1c4f0151fb47fecf295935000c71dc7
parente7e0186eeb0a0aa1e2ca805b97eb60cbd14e0567
parent2f3bada63e57345329c4f9b48e9b81b5cfc03d05
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@gmx.at>
Changelog
libavformat/Makefile
libavformat/allformats.c
libavformat/rtpdec.c
libavformat/rtpdec.h
libavformat/rtsp.c
libavformat/rtsp.h
libavformat/srtpproto.c
libavformat/version.h