aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86/blockdsp.asm
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-30 00:23:32 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-30 00:24:41 +0200
commit865564c466c35eb89519084cd4d64aa0d7dc5bb8 (patch)
tree7033b436aeffb927770274d770b747e17c682c56 /libavcodec/x86/blockdsp.asm
parent4c6beaed9210f01290e5a5a4e377f93f145172cc (diff)
parent7e38340b831af8e3271f22bd66b9da14953c02af (diff)
downloadffmpeg-865564c466c35eb89519084cd4d64aa0d7dc5bb8.tar.gz
Merge commit '7e38340b831af8e3271f22bd66b9da14953c02af'
* commit '7e38340b831af8e3271f22bd66b9da14953c02af': hmac: add support for SHA-2 Conflicts: libavutil/hmac.c libavutil/hmac.h See: 82ef67016ef731268ab7b8e91139bd5f16edc991 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/x86/blockdsp.asm')
0 files changed, 0 insertions, 0 deletions