OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1070eba
)
memcpy
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 14 Jan 2007 13:37:19 +0000
(13:37 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 14 Jan 2007 13:37:19 +0000
(13:37 +0000)
Originally committed as revision 7469 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavutil/aes.c
patch
|
blob
|
history
diff --git
a/libavutil/aes.c
b/libavutil/aes.c
index
0aa1150
..
f06c4a6
100644
(file)
--- a/
libavutil/aes.c
+++ b/
libavutil/aes.c
@@
-146,8
+146,7
@@
AVAES *av_aes_init(uint8_t *key, int key_bits) {
for(t= 0; t < (rounds+1)*4; ) {
for(j = 0; (j < KC) && (t < (rounds+1)*4); j++, t++)
- for(i = 0; i < 4; i++)
- a->round_key[0][t][i] = tk[j][i];
+ 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]];