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/md5.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/md5.h')
| -rw-r--r-- | libavutil/md5.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavutil/md5.h b/libavutil/md5.h index a3534edad0..69199cc53c 100644 --- a/libavutil/md5.h +++ b/libavutil/md5.h @@ -23,16 +23,22 @@ #include <stdint.h> +#include "attributes.h" +#include "version.h" + /** * @defgroup lavu_md5 MD5 * @ingroup lavu_crypto * @{ */ -extern const int av_md5_size; +#if FF_API_CONTEXT_SIZE +extern attribute_deprecated const int av_md5_size; +#endif struct AVMD5; +struct AVMD5 *av_md5_alloc(void); void av_md5_init(struct AVMD5 *ctx); void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, const int len); void av_md5_final(struct AVMD5 *ctx, uint8_t *dst); |