diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 16:52:34 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 16:52:34 +0400 |
commit | f391e405dfde35bfb3fea9ccc09bd67b5cc0a8f2 (patch) | |
tree | 739e823660aa365a392c509acd1ac1686272029f /libavutil/md5.c | |
parent | d6135a886d85bdbf271c55a238c3336670adc742 (diff) | |
parent | e002e3291e6dc7953f843abf56fc14f08f238b21 (diff) |
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.c')
-rw-r--r-- | libavutil/md5.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavutil/md5.c b/libavutil/md5.c index 00447f92f0..ce8400fdac 100644 --- a/libavutil/md5.c +++ b/libavutil/md5.c @@ -34,6 +34,7 @@ #include "bswap.h" #include "intreadwrite.h" #include "md5.h" +#include "mem.h" typedef struct AVMD5{ uint64_t len; @@ -41,7 +42,14 @@ typedef struct AVMD5{ uint32_t ABCD[4]; } AVMD5; +#if FF_API_CONTEXT_SIZE const int av_md5_size = sizeof(AVMD5); +#endif + +struct AVMD5 *av_md5_alloc(void) +{ + return av_mallocz(sizeof(struct AVMD5)); +} static const uint8_t S[4][4] = { { 7, 12, 17, 22 }, /* round 1 */ |