[FFmpeg-cvslog] Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d'

Michael Niedermayer git at videolan.org
Tue Jan 15 16:03:58 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 15 15:56:12 2013 +0100| [e7e0186eeb0a0aa1e2ca805b97eb60cbd14e0567] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7e0186eeb0a0aa1e2ca805b97eb60cbd14e0567
---





More information about the ffmpeg-cvslog mailing list