generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavu/aes: align AVAES struct members

Browse Source
This commit is contained in:
Rodger Combs 2015-10-11 22:15:08 -05:00
parent 15ff5c7215
commit 54cd1ab555
1 changed files with 3 additions and 2 deletions

5
libavutil/aes_internal.h

@ -21,6 +21,7 @@
#ifndef AVUTIL_AES_INTERNAL_H #ifndef AVUTIL_AES_INTERNAL_H
#define AVUTIL_AES_INTERNAL_H #define AVUTIL_AES_INTERNAL_H
#include "mem.h"
#include <stdint.h> #include <stdint.h>
typedef union { typedef union {
@ -33,8 +34,8 @@ typedef union {
typedef struct AVAES { typedef struct AVAES {
// Note: round_key[16] is accessed in the init code, but this only // Note: round_key[16] is accessed in the init code, but this only
// overwrites state, which does not matter (see also commit ba554c0). // overwrites state, which does not matter (see also commit ba554c0).
av_aes_block round_key[15]; DECLARE_ALIGNED(16, av_aes_block, round_key)[15];
av_aes_block state[2]; DECLARE_ALIGNED(16, av_aes_block, state)[2];
int rounds; int rounds;
void (*crypt)(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int rounds); void (*crypt)(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int rounds);
} AVAES; } AVAES;