diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-30 01:27:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-30 01:28:00 +0200 |
| commit | 277a5005b78dc4a11cde527c8c462721c61c886e (patch) | |
| tree | ae6e413e564fcc8f2b2662ba87794e7b3df25ad0 /libavcodec/mpegutils.h | |
| parent | 8c5cc7b7fba0986cb535cf96b0def708de1087b2 (diff) | |
| parent | e59f7cd89e7f4f096f8456d63191adec2f8b1083 (diff) | |
| download | ffmpeg-277a5005b78dc4a11cde527c8c462721c61c886e.tar.gz | |
Merge commit 'e59f7cd89e7f4f096f8456d63191adec2f8b1083'
* commit 'e59f7cd89e7f4f096f8456d63191adec2f8b1083':
fate: add test vectors for HMAC SHA and SHA-2
Conflicts:
libavutil/hmac.c
tests/ref/fate/hmac
See: 1163910a00595f01f5f6aabd5d69b01925429401
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mpegutils.h')
0 files changed, 0 insertions, 0 deletions