diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-08 16:34:50 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-08 16:34:50 +0200 |
commit | 4959c4a793313d0684026f14ffae61766c8b16fe (patch) | |
tree | 0e32105cfe6802d46864889dc09de1437bd1f05e | |
parent | ab1e1917209cfad00f56ac5f0a2fa854d377cd40 (diff) | |
download | ffmpeg-4959c4a793313d0684026f14ffae61766c8b16fe.tar.gz |
avcodec/pthread_slice: Use av_malloc(z)_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/pthread_slice.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/pthread_slice.c b/libavcodec/pthread_slice.c index edfe9c6620..334aaac0fc 100644 --- a/libavcodec/pthread_slice.c +++ b/libavcodec/pthread_slice.c @@ -201,7 +201,7 @@ int ff_slice_thread_init(AVCodecContext *avctx) if (!c) return -1; - c->workers = av_mallocz(sizeof(pthread_t)*thread_count); + c->workers = av_mallocz_array(thread_count, sizeof(pthread_t)); if (!c->workers) { av_free(c); return -1; @@ -266,15 +266,15 @@ int ff_alloc_entries(AVCodecContext *avctx, int count) if (avctx->active_thread_type & FF_THREAD_SLICE) { SliceThreadContext *p = avctx->internal->thread_ctx; p->thread_count = avctx->thread_count; - p->entries = av_mallocz(count * sizeof(int)); + p->entries = av_mallocz_array(count, sizeof(int)); if (!p->entries) { return AVERROR(ENOMEM); } p->entries_count = count; - p->progress_mutex = av_malloc(p->thread_count * sizeof(pthread_mutex_t)); - p->progress_cond = av_malloc(p->thread_count * sizeof(pthread_cond_t)); + p->progress_mutex = av_malloc_array(p->thread_count, sizeof(pthread_mutex_t)); + p->progress_cond = av_malloc_array(p->thread_count, sizeof(pthread_cond_t)); for (i = 0; i < p->thread_count; i++) { pthread_mutex_init(&p->progress_mutex[i], NULL); |