aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-11-19 00:58:35 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2015-11-26 00:56:12 +0100
commitb3494e3c3eab98cfca8a39ce1122f79becbf7cfa (patch)
treea54d3d1f9a85ecbf7d40324fe824e1db2a5a408d
parent3885ef0c6c9c6d1501766341c6b44d6b169c20dd (diff)
downloadffmpeg-b3494e3c3eab98cfca8a39ce1122f79becbf7cfa.tar.gz
avcodec/pthread_slice: Remove rets_count
It appears rets_count is redundant Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/pthread_slice.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/pthread_slice.c b/libavcodec/pthread_slice.c
index f2c05d8772..e887428aa0 100644
--- a/libavcodec/pthread_slice.c
+++ b/libavcodec/pthread_slice.c
@@ -50,7 +50,6 @@ typedef struct SliceThreadContext {
action_func2 *func2;
void *args;
int *rets;
- int rets_count;
int job_count;
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):
c->func2(avctx, c->args, our_job, self_id);
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);
our_job = c->current_job++;
@@ -165,10 +164,8 @@ static int thread_execute(AVCodecContext *avctx, action_func* func, void *arg, i
c->func = func;
if (ret) {
c->rets = ret;
- c->rets_count = job_count;
} else {
c->rets = NULL;
- c->rets_count = 1;
}
c->current_execute++;
pthread_cond_broadcast(&c->current_job_cond);