aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/sha.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-02 17:10:43 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-02 18:51:09 +0200
commit636c2dd4389d7aad71c6ee7434d6bf7e9de1a108 (patch)
tree761607a10e0df10ee40b05fa8a221e6766925e34 /libavutil/sha.c
parent514cb9bb928191491bb2c2503b2be32904176622 (diff)
downloadffmpeg-636c2dd4389d7aad71c6ee7434d6bf7e9de1a108.tar.gz
avutil/sha: reorder Maj arguments
about 1% speedup Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/sha.c')
-rw-r--r--libavutil/sha.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/sha.c b/libavutil/sha.c
index a1f92f4cd3..5c8e3b6951 100644
--- a/libavutil/sha.c
+++ b/libavutil/sha.c
@@ -160,7 +160,7 @@ static const uint32_t K256[64] = {
#define Ch(x,y,z) (((x) & ((y) ^ (z))) ^ (z))
-#define Maj(x,y,z) ((((x) | (y)) & (z)) | ((x) & (y)))
+#define Maj(z,y,x) ((((x) | (y)) & (z)) | ((x) & (y)))
#define Sigma0_256(x) (rol((x), 30) ^ rol((x), 19) ^ rol((x), 10))
#define Sigma1_256(x) (rol((x), 26) ^ rol((x), 21) ^ rol((x), 7))