[FFmpeg-cvslog] Merge commit 'e59f7cd89e7f4f096f8456d63191adec2f8b1083'

Michael Niedermayer git at videolan.org
Thu Jul 30 01:35:54 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Jul 30 01:27:36 2015 +0200| [277a5005b78dc4a11cde527c8c462721c61c886e] | committer: Michael Niedermayer

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 at niedermayer.cc>

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





More information about the ffmpeg-cvslog mailing list