Commit e002e329 authored by Martin Storsjö's avatar Martin Storsjö

Use the new aes/md5/sha/tree allocation functions

Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent 9a92aea2
...@@ -354,7 +354,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) ...@@ -354,7 +354,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
s->channels, 16); s->channels, 16);
/* initialize MD5 context */ /* initialize MD5 context */
s->md5ctx = av_malloc(av_md5_size); s->md5ctx = av_md5_alloc();
if (!s->md5ctx) if (!s->md5ctx)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
av_md5_init(s->md5ctx); av_md5_init(s->md5ctx);
......
...@@ -87,7 +87,7 @@ static int crypto_open(URLContext *h, const char *uri, int flags) ...@@ -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"); av_log(h, AV_LOG_ERROR, "Unable to open input\n");
goto err; goto err;
} }
c->aes = av_mallocz(av_aes_size); c->aes = av_aes_alloc();
if (!c->aes) { if (!c->aes) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto err; goto err;
......
...@@ -159,7 +159,7 @@ static char *make_digest_auth(HTTPAuthState *state, const char *username, ...@@ -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); ff_data_to_hex(cnonce, (const uint8_t*) cnonce_buf, sizeof(cnonce_buf), 1);
cnonce[2*sizeof(cnonce_buf)] = 0; cnonce[2*sizeof(cnonce_buf)] = 0;
md5ctx = av_malloc(av_md5_size); md5ctx = av_md5_alloc();
if (!md5ctx) if (!md5ctx)
return NULL; return NULL;
......
...@@ -340,7 +340,7 @@ static int mxf_decrypt_triplet(AVFormatContext *s, AVPacket *pkt, KLVPacket *klv ...@@ -340,7 +340,7 @@ static int mxf_decrypt_triplet(AVFormatContext *s, AVPacket *pkt, KLVPacket *klv
int index; int index;
if (!mxf->aesc && s->key && s->keylen == 16) { if (!mxf->aesc && s->key && s->keylen == 16) {
mxf->aesc = av_malloc(av_aes_size); mxf->aesc = av_aes_alloc();
if (!mxf->aesc) if (!mxf->aesc)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
av_aes_init(mxf->aesc, s->key, 128, 1); av_aes_init(mxf->aesc, s->key, 128, 1);
......
...@@ -116,7 +116,7 @@ int ff_nut_sp_pts_cmp(const Syncpoint *a, const Syncpoint *b){ ...@@ -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){ void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts){
Syncpoint *sp= av_mallocz(sizeof(Syncpoint)); 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->pos= pos;
sp->back_ptr= back_ptr; sp->back_ptr= back_ptr;
......
...@@ -859,7 +859,7 @@ int ff_rtmp_calc_digest(const uint8_t *src, int len, int gap, ...@@ -859,7 +859,7 @@ int ff_rtmp_calc_digest(const uint8_t *src, int len, int gap,
uint8_t hmac_buf[64+32] = {0}; uint8_t hmac_buf[64+32] = {0};
int i; int i;
sha = av_mallocz(av_sha_size); sha = av_sha_alloc();
if (!sha) if (!sha)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
......
...@@ -220,7 +220,7 @@ int main (void) ...@@ -220,7 +220,7 @@ int main (void)
} }
av_log(NULL, AV_LOG_ERROR, "inserting %4d\n", j); av_log(NULL, AV_LOG_ERROR, "inserting %4d\n", j);
if (!node) if (!node)
node = av_mallocz(av_tree_node_size); node = av_tree_node_alloc();
av_tree_insert(&root, (void *) (j + 1), cmp, &node); av_tree_insert(&root, (void *) (j + 1), cmp, &node);
j = av_lfg_get(&prng) % 86294; j = av_lfg_get(&prng) % 86294;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment