Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRodger Combs <rodger.combs@gmail.com>2015-10-12 06:15:08 +0300
committerRodger Combs <rodger.combs@gmail.com>2015-10-28 12:23:14 +0300
commit54cd1ab55513e0a12f90dba8036b0a54b16d8ff7 (patch)
tree0d3a8e405e81b8fd6982f88864f7016f818e9dfd /libavutil
parent15ff5c7215def8e6bc38f6b84526fb1266c09dc3 (diff)
lavu/aes: align AVAES struct members
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/aes_internal.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavutil/aes_internal.h b/libavutil/aes_internal.h
index e5bf4bde07..494425878d 100644
--- a/libavutil/aes_internal.h
+++ b/libavutil/aes_internal.h
@@ -21,6 +21,7 @@
#ifndef AVUTIL_AES_INTERNAL_H
#define AVUTIL_AES_INTERNAL_H
+#include "mem.h"
#include <stdint.h>
typedef union {
@@ -33,8 +34,8 @@ typedef union {
typedef struct AVAES {
// Note: round_key[16] is accessed in the init code, but this only
// overwrites state, which does not matter (see also commit ba554c0).
- av_aes_block round_key[15];
- av_aes_block state[2];
+ DECLARE_ALIGNED(16, av_aes_block, round_key)[15];
+ DECLARE_ALIGNED(16, av_aes_block, state)[2];
int rounds;
void (*crypt)(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int rounds);
} AVAES;