Commit 865564c4 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '7e38340b'

* commit '7e38340b':
  hmac: add support for SHA-2

Conflicts:
	libavutil/hmac.c
	libavutil/hmac.h

See: 82ef6701Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents 4c6beaed 7e38340b
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment