aboutsummaryrefslogtreecommitdiffstats
path: root/doc
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 /doc
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 'doc')
-rw-r--r--doc/APIchanges3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index 99b1c92983..2a7206a75a 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -132,6 +132,9 @@ API changes, most recent first:
2012-03-26 - a67d9cf - lavfi 2.66.100
Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.
+2013-01-xx - xxxxxxx - lavu 52.5.0 - hmac.h
+ Add AVHMAC.
+
2013-01-13 - xxxxxxx - lavc 54.36.0 - vdpau.h
Add AVVDPAUContext struct for VDPAU hardware-accelerated decoding.