Mercurial > libavcodec.hg

diff pthread.c @ 10954:d7ef6611a49e libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Always call avcodec_thread_init() The various avcodec_thread_init() functions are updated to return immediately after setting avctx->thread_count. This allows -threads 0 to pass through to codecs. It also simplifies the usage for apps using libavcodec.
author mru
date Wed, 20 Jan 2010 22:55:50 +0000
parents 98501365c3aa
children 8de15f200be8
line wrap: on
line diff
--- a/pthread.c	Wed Jan 20 19:23:19 2010 +0000
+++ b/pthread.c	Wed Jan 20 22:55:50 2010 +0000
@@ -145,6 +145,11 @@
     int i;
     ThreadContext *c;
 
+    avctx->thread_count = thread_count;
+
+    if (thread_count <= 1)
+        return 0;
+
     c = av_mallocz(sizeof(ThreadContext));
     if (!c)
         return -1;
@@ -156,7 +161,6 @@
     }
 
     avctx->thread_opaque = c;
-    avctx->thread_count = thread_count;
     c->current_job = 0;
     c->job_count = 0;
     c->job_size = 0;