diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:52:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:52:34 +0200 |
| commit | f391e405dfde35bfb3fea9ccc09bd67b5cc0a8f2 (patch) | |
| tree | 739e823660aa365a392c509acd1ac1686272029f /libavutil/aes.c | |
| parent | d6135a886d85bdbf271c55a238c3336670adc742 (diff) | |
| parent | e002e3291e6dc7953f843abf56fc14f08f238b21 (diff) | |
| download | ffmpeg-f391e405dfde35bfb3fea9ccc09bd67b5cc0a8f2.tar.gz | |
Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'
* commit 'e002e3291e6dc7953f843abf56fc14f08f238b21':
Use the new aes/md5/sha/tree allocation functions
avutil: Add functions for allocating opaque contexts for algorithms
svq3: fix pointer type warning
svq3: replace unsafe pointer casting with intreadwrite macros
parseutils-test: various cleanups
Conflicts:
doc/APIchanges
libavcodec/svq3.c
libavutil/parseutils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/aes.c')
| -rw-r--r-- | libavutil/aes.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavutil/aes.c b/libavutil/aes.c index 7950902280..555cbb82cf 100644 --- a/libavutil/aes.c +++ b/libavutil/aes.c @@ -39,7 +39,14 @@ typedef struct AVAES { int rounds; } AVAES; +#if FF_API_CONTEXT_SIZE const int av_aes_size= sizeof(AVAES); +#endif + +struct AVAES *av_aes_alloc(void) +{ + return av_mallocz(sizeof(struct AVAES)); +} static const uint8_t rcon[10] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36 |