summaryrefslogtreecommitdiff
path: root/libavutil/aes.c
diff options
context:
space:
mode:
authorRodger Combs <rodger.combs@gmail.com>2015-10-11 22:12:16 -0500
committerRodger Combs <rodger.combs@gmail.com>2015-10-28 04:23:14 -0500
commitec588db56fdc21606a8c8b9b32f4a54aacbe7aca (patch)
tree906fe32d642afc289e37022432e3bb88d59be068 /libavutil/aes.c
parent1e477a970fd57f83b210b3cbc77698891d6bdf78 (diff)
lavu/aes: move AVAES to separate internal header
Diffstat (limited to 'libavutil/aes.c')
-rw-r--r--libavutil/aes.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/libavutil/aes.c b/libavutil/aes.c
index b59e7dec44..61e9dd1b32 100644
--- a/libavutil/aes.c
+++ b/libavutil/aes.c
@@ -22,24 +22,10 @@
#include "common.h"
#include "aes.h"
+#include "aes_internal.h"
#include "intreadwrite.h"
#include "timer.h"
-typedef union {
- uint64_t u64[2];
- uint32_t u32[4];
- uint8_t u8x4[4][4];
- uint8_t u8[16];
-} av_aes_block;
-
-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];
- int rounds;
-} AVAES;
-
const int av_aes_size= sizeof(AVAES);
struct AVAES *av_aes_alloc(void)