[FFmpeg-cvslog] Use the new aes/md5/sha/tree allocation functions
Martin Storsjö
git at videolan.org
Fri Oct 12 14:59:05 CEST 2012
ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu Oct 11 15:10:45 2012 +0300| [e002e3291e6dc7953f843abf56fc14f08f238b21] | committer: Martin Storsjö
Use the new aes/md5/sha/tree allocation functions
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e002e3291e6dc7953f843abf56fc14f08f238b21
---
libavcodec/flacenc.c | 2 +-
libavformat/crypto.c | 2 +-
libavformat/httpauth.c | 2 +-
libavformat/mxfdec.c | 2 +-
libavformat/nut.c | 2 +-
libavformat/rtmpproto.c | 2 +-
libavutil/tree.c | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index 122d485..b135e4a 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -354,7 +354,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
s->channels, 16);
/* initialize MD5 context */
- s->md5ctx = av_malloc(av_md5_size);
+ s->md5ctx = av_md5_alloc();
if (!s->md5ctx)
return AVERROR(ENOMEM);
av_md5_init(s->md5ctx);
diff --git a/libavformat/crypto.c b/libavformat/crypto.c
index 93c9f23..3bc33f2 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 4ec8ac2..774ee21 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 25d18f4..8595d72 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 4e46b98..6a68e28 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 d04f3a7..a5bc246 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);
diff --git a/libavutil/tree.c b/libavutil/tree.c
index 55dcbc5..fd51a74 100644
--- a/libavutil/tree.c
+++ b/libavutil/tree.c
@@ -220,7 +220,7 @@ int main (void)
}
av_log(NULL, AV_LOG_ERROR, "inserting %4d\n", j);
if (!node)
- node = av_mallocz(av_tree_node_size);
+ node = av_tree_node_alloc();
av_tree_insert(&root, (void *) (j + 1), cmp, &node);
j = av_lfg_get(&prng) % 86294;
More information about the ffmpeg-cvslog
mailing list