Merge commit '7e38340b831af8e3271f22bd66b9da14953c02af'

Browse Source

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

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

See: 82ef67016e
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

pull/161/head

Michael Niedermayer 9 years ago

parent 4c6beaed92 7e38340b83

commit 865564c466

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available