[FFmpeg-cvslog] lavc/pthread_slice: remove pointless condition

Clément Bœsch git at videolan.org
Wed Mar 29 15:55:07 EEST 2017


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Mar 29 12:20:32 2017 +0200| [eaa67bb9c0595d2e2e7b555c38e864f5d6f851a7] | committer: Clément Bœsch

lavc/pthread_slice: remove pointless condition

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eaa67bb9c0595d2e2e7b555c38e864f5d6f851a7
---

 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 96a7643..60f5b78 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);
 



More information about the ffmpeg-cvslog mailing list