apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-23 17:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add av_ prefix to bswap macros

Browse Source 
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2010-07-10 22:12:30 +00:00
parent e6b22522c9
commit 8fc0162ac4
51 changed files with 175 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/sha.c
View File

@@ -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)