[SCM] libav/experimental: memcpy
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:54:49 UTC 2013
The following commit has been merged in the experimental branch:
commit 7acc1a27bc27a74d2e9862dc22f403dfec09d267
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Jan 14 13:37:19 2007 +0000
memcpy
Originally committed as revision 7469 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavutil/aes.c b/libavutil/aes.c
index 0aa1150..f06c4a6 100644
--- 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]];
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list