Add support for RVTR fourCC

[ffmpeg] / libavutil / aes.c

diff --git a/libavutil/aes.c b/libavutil/aes.c
index b29e735d497295c3cb781204e401553d9b173ede..5030dac487e063a7fa257e4075f1784aa45464d5 100644 (file)
--- a/libavutil/aes.c
+++ b/libavutil/aes.c
@@ -1,6 +1,8 @@
 /*
  * copyright (c) 2007 Michael Niedermayer <michaelni@gmx.at>
  *
+ * some optimization ideas from aes128.c by Reimar Doeffinger
+ *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
@@ -16,14 +18,14 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * some optimization ideas from aes128.c by Reimar Doeffinger
  */
 
 #include "common.h"
 #include "aes.h"
 
 typedef struct AVAES{
+    // Note: round_key[16] is accessed in the init code, but this only
+    // overwrites state, which does not matter (see also r7471).
     uint8_t round_key[15][4][4];
     uint8_t state[2][4][4];
     int rounds;
@@ -192,7 +194,9 @@ int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt) {
 #ifdef TEST
 #include "log.h"
 
-int main(){
+#undef random
+
+int main(void){
     int i,j;
     AVAES ae, ad, b;
     uint8_t rkey[2][16]= {