aboutsummaryrefslogtreecommitdiffstats
path: root/doc/filters.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-15 16:05:00 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-15 16:05:34 +0100
commitb52925d2cde98b2a3ffaf451248191c8627d356a (patch)
treeb5bc13efa1c4f0151fb47fecf295935000c71dc7 /doc/filters.texi
parente7e0186eeb0a0aa1e2ca805b97eb60cbd14e0567 (diff)
parent2f3bada63e57345329c4f9b48e9b81b5cfc03d05 (diff)
downloadffmpeg-b52925d2cde98b2a3ffaf451248191c8627d356a.tar.gz
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>
Diffstat (limited to 'doc/filters.texi')
0 files changed, 0 insertions, 0 deletions