[FFmpeg-cvslog] Merge commit 'a2a991b2ddf951454ffceb7bcedc9db93e26c610'

Michael Niedermayer git at videolan.org
Mon Jan 21 15:06:56 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 21 15:00:45 2013 +0100| [bc639dbd9b835622b2b0713f24cacbdbf464d065] | committer: Michael Niedermayer

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

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





More information about the ffmpeg-cvslog mailing list