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.h | |
| 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.h')
| -rw-r--r-- | libavutil/aes.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libavutil/aes.h b/libavutil/aes.h index bafa4cc3c4..9c1a54e036 100644 --- a/libavutil/aes.h +++ b/libavutil/aes.h @@ -23,17 +23,27 @@ #include <stdint.h> +#include "attributes.h" +#include "version.h" + /** * @defgroup lavu_aes AES * @ingroup lavu_crypto * @{ */ -extern const int av_aes_size; +#if FF_API_CONTEXT_SIZE +extern attribute_deprecated const int av_aes_size; +#endif struct AVAES; /** + * Allocate an AVAES context. + */ +struct AVAES *av_aes_alloc(void); + +/** * Initialize an AVAES context. * @param key_bits 128, 192 or 256 * @param decrypt 0 for encryption, 1 for decryption |