diff options
| author | Martin Storsjö <martin@martin.st> | 2012-10-11 15:10:45 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-10-11 23:35:28 +0300 |
| commit | e002e3291e6dc7953f843abf56fc14f08f238b21 (patch) | |
| tree | 0792966d2a823bd1dfdca5b3ee078ca794ec1df8 /libavformat | |
| parent | 9a92aea27bad2f5603ca85e0d0716c679a6b686c (diff) | |
| download | ffmpeg-e002e3291e6dc7953f843abf56fc14f08f238b21.tar.gz | |
Use the new aes/md5/sha/tree allocation functions
Signed-off-by: Martin Storsjö <martin@martin.st>
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 93c9f23f68..3bc33f2bb9 100644 --- a/libavformat/crypto.c +++ b/libavformat/crypto.c @@ -87,7 +87,7 @@ static int crypto_open(URLContext *h, const char *uri, int flags) 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 4ec8ac2599..774ee2134f 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 25d18f4829..8595d72083 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -340,7 +340,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 4e46b984b4..6a68e28173 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -116,7 +116,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(); sp->pos= pos; sp->back_ptr= back_ptr; diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index d04f3a70a4..a5bc246e31 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); |