[SCM] libav/experimental: avoid memcpy()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 2d3475ae6afc8fce33b6521aeb69489610b55f7e
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Jan 16 17:58:11 2007 +0000

    avoid memcpy()
    
    Originally committed as revision 7549 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/aes.c b/libavutil/aes.c
index f46b13c..9921b54 100644
--- a/libavutil/aes.c
+++ b/libavutil/aes.c
@@ -172,10 +172,9 @@ int av_aes_init(AVAES *a, uint8_t *key, int key_bits, int decrypt) {
 
     if(decrypt){
         for(i=1; i<rounds; i++){
-            uint8_t tmp[2][16];
-            memcpy(tmp[1], a->round_key[i][0], 16);
-            subshift(tmp[0], 0, sbox);
-            memcpy(tmp[1], tmp[0], 16);
+            uint8_t tmp[3][16];
+            memcpy(tmp[2], a->round_key[i][0], 16);
+            subshift(tmp[1], 0, sbox);
             mix(tmp, dec_multbl, 1, 3);
             memcpy(a->round_key[i][0], tmp[0], 16);
         }

-- 
Libav/FFmpeg packaging