From eaa67bb9c0595d2e2e7b555c38e864f5d6f851a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Wed, 29 Mar 2017 12:20:32 +0200 Subject: [PATCH] lavc/pthread_slice: remove pointless condition --- libavcodec/pthread_slice.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/pthread_slice.c b/libavcodec/pthread_slice.c index 96a7643f6a..60f5b78891 100644 --- a/libavcodec/pthread_slice.c +++ b/libavcodec/pthread_slice.c @@ -156,11 +156,7 @@ static int thread_execute(AVCodecContext *avctx, action_func* func, void *arg, i c->job_size = job_size; c->args = arg; c->func = func; - if (ret) { - c->rets = ret; - } else { - c->rets = NULL; - } + c->rets = ret; c->current_execute++; pthread_cond_broadcast(&c->current_job_cond);