[FFmpeg-cvslog] Merge commit '7e38340b831af8e3271f22bd66b9da14953c02af'
Michael Niedermayer
git at videolan.org
Thu Jul 30 01:26:08 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Jul 30 00:23:32 2015 +0200| [865564c466c35eb89519084cd4d64aa0d7dc5bb8] | committer: Michael Niedermayer
Merge commit '7e38340b831af8e3271f22bd66b9da14953c02af'
* commit '7e38340b831af8e3271f22bd66b9da14953c02af':
hmac: add support for SHA-2
Conflicts:
libavutil/hmac.c
libavutil/hmac.h
See: 82ef67016ef731268ab7b8e91139bd5f16edc991
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=865564c466c35eb89519084cd4d64aa0d7dc5bb8
---
More information about the ffmpeg-cvslog
mailing list