diff --git a/libavutil/aes.c b/libavutil/aes.c
index 135b9310f0..a10b45c6e6 100644
--- a/libavutil/aes.c
+++ b/libavutil/aes.c
@@ -195,36 +195,26 @@ int main(){
     int i,j;
     AVAES *ae= av_aes_init("PI=3.141592654..", 128, 0);
     AVAES *ad= av_aes_init("PI=3.141592654..", 128, 1);
-    uint8_t zero[16]= {0};
-    uint8_t pt[16]= {0x6a, 0x84, 0x86, 0x7c, 0xd7, 0x7e, 0x12, 0xad, 0x07, 0xea, 0x1b, 0xe8, 0x95, 0xc5, 0x3f, 0xa3};
-    uint8_t ct[16]= {0x73, 0x22, 0x81, 0xc0, 0xa0, 0xaa, 0xb8, 0xf7, 0xa5, 0x4a, 0x0c, 0x67, 0xa0, 0xc4, 0x5e, 0xcf};
-    AVAES *b= av_aes_init(zero, 128, 1);
-
-/*    uint8_t key[16]= {0x42, 0x78, 0xb8, 0x40, 0xfb, 0x44, 0xaa, 0xa7, 0x57, 0xc1, 0xbf, 0x04, 0xac, 0xbe, 0x1a, 0x3e};
-    uint8_t IV[16] = {0x57, 0xf0, 0x2a, 0x5c, 0x53, 0x39, 0xda, 0xeb, 0x0a, 0x29, 0x08, 0xa0, 0x6a, 0xc6, 0x39, 0x3f};
-    uint8_t pt[16] = {0x3c, 0x88, 0x8b, 0xbb, 0xb1, 0xa8, 0xeb, 0x9f, 0x3e, 0x9b, 0x87, 0xac, 0xaa, 0xd9, 0x86, 0xc4};
-//            66e2f7071c83083b8a557971918850e5
-    uint8_t ct[16] = {0x47, 0x9c, 0x89, 0xec, 0x14, 0xbc, 0x98, 0x99, 0x4e, 0x62, 0xb2, 0xc7, 0x05, 0xb5, 0x0, 0x14e};
-//             175bd7832e7e60a1e92aac568a861eb7*/
-    uint8_t ckey[16]= {0x10, 0xa5, 0x88, 0x69, 0xd7, 0x4b, 0xe5, 0xa3, 0x74, 0xcf, 0x86, 0x7c, 0xfb, 0x47, 0x38, 0x59};
-    uint8_t cct[16] = {0x6d, 0x25, 0x1e, 0x69, 0x44, 0xb0, 0x51, 0xe0, 0x4e, 0xaa, 0x6f, 0xb4, 0xdb, 0xf7, 0x84, 0x65};
-    AVAES *c= av_aes_init(ckey, 128, 1);
+    uint8_t rkey[2][16]= {
+        {0},
+        {0x10, 0xa5, 0x88, 0x69, 0xd7, 0x4b, 0xe5, 0xa3, 0x74, 0xcf, 0x86, 0x7c, 0xfb, 0x47, 0x38, 0x59}};
+    uint8_t pt[16], rpt[2][16]= {
+        {0x6a, 0x84, 0x86, 0x7c, 0xd7, 0x7e, 0x12, 0xad, 0x07, 0xea, 0x1b, 0xe8, 0x95, 0xc5, 0x3f, 0xa3},
+        {0}};
+    uint8_t rct[2][16]= {
+        {0x73, 0x22, 0x81, 0xc0, 0xa0, 0xaa, 0xb8, 0xf7, 0xa5, 0x4a, 0x0c, 0x67, 0xa0, 0xc4, 0x5e, 0xcf},
+        {0x6d, 0x25, 0x1e, 0x69, 0x44, 0xb0, 0x51, 0xe0, 0x4e, 0xaa, 0x6f, 0xb4, 0xdb, 0xf7, 0x84, 0x65}};
 
     av_log_level= AV_LOG_DEBUG;
 
-    memcpy(b->state, ct, 16);
-    av_aes_decrypt(b);
-    for(j=0; j<16; j++)
-        if(pt[j] != b->state[0][j]){
-            av_log(NULL, AV_LOG_ERROR, "%d %02X %02X\n", j, pt[j], b->state[0][j]);
-        }
-
-    memcpy(c->state, cct, 16);
-    av_aes_decrypt(c);
-    for(j=0; j<16; j++)
-        if(zero[j] != c->state[0][j]){
-            av_log(NULL, AV_LOG_ERROR, "%d %02X %02X\n", j, zero[j], c->state[0][j]);
-        }
+    for(i=0; i<2; i++){
+        AVAES *b= av_aes_init(rkey[i], 128, 1);
+        memcpy(b->state, rct[i], 16);
+        av_aes_decrypt(b);
+        for(j=0; j<16; j++)
+            if(rpt[i][j] != b->state[0][j])
+                av_log(NULL, AV_LOG_ERROR, "%d %02X %02X\n", j, rpt[i][j], b->state[0][j]);
+    }
 
     for(i=0; i<10000; i++){
         for(j=0; j<16; j++){