mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '7e38340b831af8e3271f22bd66b9da14953c02af'
* commit '7e38340b831af8e3271f22bd66b9da14953c02af':
hmac: add support for SHA-2
Conflicts:
libavutil/hmac.c
libavutil/hmac.h
See: 82ef67016e
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
commit
865564c466