Michael Niedermayer bc639dbd9b Merge commit 'a2a991b2ddf951454ffceb7bcedc9db93e26c610' ...

* commit 'a2a991b2ddf951454ffceb7bcedc9db93e26c610':
  srtp: Improve the minimum encryption buffer size check
  srtp: Add support for a few DTLS-SRTP related crypto suites

Conflicts:
	libavformat/version.h

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

2013-01-21 15:00:45 +01:00

1.6 KiB

Raw Blame History

View Raw