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 /libavformat | |
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 'libavformat')
-rw-r--r-- | libavformat/crypto.c | 2 | ||||
-rw-r--r-- | libavformat/httpauth.c | 2 | ||||
-rw-r--r-- | libavformat/mxfdec.c | 2 | ||||
-rw-r--r-- | libavformat/nut.c | 2 | ||||
-rw-r--r-- | libavformat/rtmpproto.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/crypto.c b/libavformat/crypto.c index 06c687e3fc..5d518beb01 100644 --- a/libavformat/crypto.c +++ b/libavformat/crypto.c @@ -87,7 +87,7 @@ static int crypto_open2(URLContext *h, const char *uri, int flags, AVDictionary av_log(h, AV_LOG_ERROR, "Unable to open input\n"); goto err; } - c->aes = av_mallocz(av_aes_size); + c->aes = av_aes_alloc(); if (!c->aes) { ret = AVERROR(ENOMEM); goto err; diff --git a/libavformat/httpauth.c b/libavformat/httpauth.c index 646f909a0d..e97aee1f66 100644 --- a/libavformat/httpauth.c +++ b/libavformat/httpauth.c @@ -159,7 +159,7 @@ static char *make_digest_auth(HTTPAuthState *state, const char *username, ff_data_to_hex(cnonce, (const uint8_t*) cnonce_buf, sizeof(cnonce_buf), 1); cnonce[2*sizeof(cnonce_buf)] = 0; - md5ctx = av_malloc(av_md5_size); + md5ctx = av_md5_alloc(); if (!md5ctx) return NULL; diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index b7c082605a..1f583b8ad6 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -350,7 +350,7 @@ static int mxf_decrypt_triplet(AVFormatContext *s, AVPacket *pkt, KLVPacket *klv int index; if (!mxf->aesc && s->key && s->keylen == 16) { - mxf->aesc = av_malloc(av_aes_size); + mxf->aesc = av_aes_alloc(); if (!mxf->aesc) return AVERROR(ENOMEM); av_aes_init(mxf->aesc, s->key, 128, 1); diff --git a/libavformat/nut.c b/libavformat/nut.c index 30c0eb6179..02dd122b0a 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -139,7 +139,7 @@ int ff_nut_sp_pts_cmp(const Syncpoint *a, const Syncpoint *b){ void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts){ Syncpoint *sp= av_mallocz(sizeof(Syncpoint)); - struct AVTreeNode *node= av_mallocz(av_tree_node_size); + struct AVTreeNode *node = av_tree_node_alloc(); nut->sp_count++; diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index d76a5114dc..dbe987058a 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -859,7 +859,7 @@ int ff_rtmp_calc_digest(const uint8_t *src, int len, int gap, uint8_t hmac_buf[64+32] = {0}; int i; - sha = av_mallocz(av_sha_size); + sha = av_sha_alloc(); if (!sha) return AVERROR(ENOMEM); |