aboutsummaryrefslogtreecommitdiffstats
path: root/RELEASE
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-15 15:56:12 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-15 15:57:33 +0100
commite7e0186eeb0a0aa1e2ca805b97eb60cbd14e0567 (patch)
treeb19a7ab7351615a21aa0ac7d57c7a486f7318e5b /RELEASE
parente074fe2962df5a43ac41f26b2180094057600cc5 (diff)
parentab2ad8bd56882c0ea160b154e8b836eb71abc49d (diff)
downloadffmpeg-e7e0186eeb0a0aa1e2ca805b97eb60cbd14e0567.tar.gz
Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d'
* commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d': lavf: Add functions for SRTP decryption/encryption lavu: Add an API for calculating HMAC (RFC 2104) Conflicts: doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'RELEASE')
0 files changed, 0 insertions, 0 deletions