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:
17c78b0
)
Pass subshift an argument of the proper type.
author
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Mon, 28 Jun 2010 17:19:55 +0000
(17:19 +0000)
committer
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Mon, 28 Jun 2010 17:19:55 +0000
(17:19 +0000)
No changes in generated code.
Originally committed as revision 23856 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavutil/aes.c
patch
|
blob
|
history
diff --git
a/libavutil/aes.c
b/libavutil/aes.c
index
e21599a
..
da4ecbb
100644
(file)
--- a/
libavutil/aes.c
+++ b/
libavutil/aes.c
@@
-177,7
+177,7
@@
int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt) {
for(i=1; i<rounds; i++){
uint8_t tmp[3][16];
memcpy(tmp[2], a->round_key[i][0], 16);
- subshift(tmp[1], 0, sbox);
+ subshift(
&
tmp[1], 0, sbox);
mix(tmp, dec_multbl, 1, 3);
memcpy(a->round_key[i][0], tmp[0], 16);
}