diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-07-10 22:12:30 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-07-10 22:12:30 +0000 |
| commit | 8fc0162ac44f3e60798552ca6d19387be95cae4c (patch) | |
| tree | 443f7c684a3a8be0e9b70d67a91b8572bfa1ddd2 /libavutil/sha.c | |
| parent | e6b22522c94cfccda97018e52ab65da8c69d8a56 (diff) | |
| download | ffmpeg-8fc0162ac44f3e60798552ca6d19387be95cae4c.tar.gz | |
Add av_ prefix to bswap macros
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/sha.c')
| -rw-r--r-- | libavutil/sha.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/sha.c b/libavutil/sha.c index f89ea52a5f..2657f7eb90 100644 --- a/libavutil/sha.c +++ b/libavutil/sha.c @@ -43,7 +43,7 @@ const int av_sha_size = sizeof(AVSHA); #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) /* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */ -#define blk0(i) (block[i] = be2ne_32(((const uint32_t*)buffer)[i])) +#define blk0(i) (block[i] = av_be2ne32(((const uint32_t*)buffer)[i])) #define blk(i) (block[i] = rol(block[i-3] ^ block[i-8] ^ block[i-14] ^ block[i-16], 1)) #define R0(v,w,x,y,z,i) z += ((w&(x^y))^y) + blk0(i) + 0x5A827999 + rol(v, 5); w = rol(w, 30); @@ -68,7 +68,7 @@ static void sha1_transform(uint32_t state[5], const uint8_t buffer[64]) for (i = 0; i < 80; i++) { int t; if (i < 16) - t = be2ne_32(((uint32_t*)buffer)[i]); + t = av_be2ne32(((uint32_t*)buffer)[i]); else t = rol(block[i-3] ^ block[i-8] ^ block[i-14] ^ block[i-16], 1); block[i] = t; @@ -314,7 +314,7 @@ void av_sha_update(AVSHA* ctx, const uint8_t* data, unsigned int len) void av_sha_final(AVSHA* ctx, uint8_t *digest) { int i; - uint64_t finalcount = be2ne_64(ctx->count << 3); + uint64_t finalcount = av_be2ne64(ctx->count << 3); av_sha_update(ctx, "\200", 1); while ((ctx->count & 63) != 56) |