diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 15:00:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 15:00:45 +0100 |
| commit | bc639dbd9b835622b2b0713f24cacbdbf464d065 (patch) | |
| tree | d3fe834f5af17e65041349384872a1f981a16e9c /libavcodec/dsputil.c | |
| parent | acc0c0190bd6144d921397d53e928532a8d86de0 (diff) | |
| parent | a2a991b2ddf951454ffceb7bcedc9db93e26c610 (diff) | |
| download | ffmpeg-bc639dbd9b835622b2b0713f24cacbdbf464d065.tar.gz | |
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>
Diffstat (limited to 'libavcodec/dsputil.c')
0 files changed, 0 insertions, 0 deletions