virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/pthread_slice: Remove rets_count

Browse Source 
It appears rets_count is redundant

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2015-11-19 00:58:35 +01:00
parent 3885ef0c6c
commit b3494e3c3e
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/pthread_slice.c
View File

@@ -50,7 +50,6 @@ typedef struct SliceThreadContext {
action_func2 *func2; action_func2 *func2;
void *args; void *args;
int *rets; int *rets;
int rets_count;
int job_count; int job_count;
int job_size; int job_size;
@@ -100,7 +99,7 @@ static void* attribute_align_arg worker(void *v)
ret = c->func ? c->func(avctx, (char*)c->args + our_job*c->job_size): ret = c->func ? c->func(avctx, (char*)c->args + our_job*c->job_size):
c->func2(avctx, c->args, our_job, self_id); c->func2(avctx, c->args, our_job, self_id);
if (c->rets) if (c->rets)
c->rets[our_job%c->rets_count] = ret; c->rets[our_job%c->job_count] = ret;
pthread_mutex_lock(&c->current_job_lock); pthread_mutex_lock(&c->current_job_lock);
our_job = c->current_job++; our_job = c->current_job++;
@@ -165,10 +164,8 @@ static int thread_execute(AVCodecContext *avctx, action_func* func, void *arg, i
c->func = func; c->func = func;
if (ret) { if (ret) {
c->rets = ret; c->rets = ret;
c->rets_count = job_count;
} else { } else {
c->rets = NULL; c->rets = NULL;
c->rets_count = 1;
} }
c->current_execute++; c->current_execute++;
pthread_cond_broadcast(&c->current_job_cond); pthread_cond_broadcast(&c->current_job_cond);