From 84c72fb129b7a567fdf935ec38d73f48f739f95e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 14 Jan 2007 13:38:10 +0000 Subject: [PATCH] cosmetics Originally committed as revision 7470 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavutil/aes.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavutil/aes.c b/libavutil/aes.c index f06c4a6e6..bdbced191 100644 --- a/libavutil/aes.c +++ b/libavutil/aes.c @@ -72,7 +72,6 @@ static inline void mix(uint8_t state[4][4], uint32_t multbl[4][256]){ #endif } - void av_aes_decrypt(AVAES *a){ int t, r; @@ -145,11 +144,11 @@ AVAES *av_aes_init(uint8_t *key, int key_bits) { memcpy(tk, key, KC*4); for(t= 0; t < (rounds+1)*4; ) { - for(j = 0; (j < KC) && (t < (rounds+1)*4); j++, t++) + for(j = 0; j < KC && t < (rounds+1)*4; j++, t++) memcpy(a->round_key[0][t], tk[j], 4); for(i = 0; i < 4; i++) - tk[0][i] ^= sbox[tk[KC-1][(i+1)&3]]; + tk[0][i] ^= sbox[tk[KC-1][(i+1)&3]]; tk[0][0] ^= rcon[rconpointer++]; for(j = 1; j < KC; j++){ -- 2.11.0