mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-14 02:53:37 +02:00
avcodec/pthread_slice: Use av_malloc(z)_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
ab1e191720
commit
4959c4a793
@ -201,7 +201,7 @@ int ff_slice_thread_init(AVCodecContext *avctx)
|
|||||||
if (!c)
|
if (!c)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
c->workers = av_mallocz(sizeof(pthread_t)*thread_count);
|
c->workers = av_mallocz_array(thread_count, sizeof(pthread_t));
|
||||||
if (!c->workers) {
|
if (!c->workers) {
|
||||||
av_free(c);
|
av_free(c);
|
||||||
return -1;
|
return -1;
|
||||||
@ -266,15 +266,15 @@ int ff_alloc_entries(AVCodecContext *avctx, int count)
|
|||||||
if (avctx->active_thread_type & FF_THREAD_SLICE) {
|
if (avctx->active_thread_type & FF_THREAD_SLICE) {
|
||||||
SliceThreadContext *p = avctx->internal->thread_ctx;
|
SliceThreadContext *p = avctx->internal->thread_ctx;
|
||||||
p->thread_count = avctx->thread_count;
|
p->thread_count = avctx->thread_count;
|
||||||
p->entries = av_mallocz(count * sizeof(int));
|
p->entries = av_mallocz_array(count, sizeof(int));
|
||||||
|
|
||||||
if (!p->entries) {
|
if (!p->entries) {
|
||||||
return AVERROR(ENOMEM);
|
return AVERROR(ENOMEM);
|
||||||
}
|
}
|
||||||
|
|
||||||
p->entries_count = count;
|
p->entries_count = count;
|
||||||
p->progress_mutex = av_malloc(p->thread_count * sizeof(pthread_mutex_t));
|
p->progress_mutex = av_malloc_array(p->thread_count, sizeof(pthread_mutex_t));
|
||||||
p->progress_cond = av_malloc(p->thread_count * sizeof(pthread_cond_t));
|
p->progress_cond = av_malloc_array(p->thread_count, sizeof(pthread_cond_t));
|
||||||
|
|
||||||
for (i = 0; i < p->thread_count; i++) {
|
for (i = 0; i < p->thread_count; i++) {
|
||||||
pthread_mutex_init(&p->progress_mutex[i], NULL);
|
pthread_mutex_init(&p->progress_mutex[i], NULL);
|
||||||
|
Loading…
Reference in New Issue
Block a user