virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '5152196b2b47d446d9a509b9bfb318daa26a1f2b'

Browse Source 
* commit '5152196b2b47d446d9a509b9bfb318daa26a1f2b':
  pthread: Avoid spurious wakeups

See: e3329474a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-10-21 19:49:12 +02:00
parent e45460aab0 5152196b2b
commit 2444fca523
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/pthread.c
View File

@@ -63,8 +63,8 @@ typedef struct ThreadContext {
pthread_cond_t last_job_cond; pthread_cond_t last_job_cond;
pthread_cond_t current_job_cond; pthread_cond_t current_job_cond;
pthread_mutex_t current_job_lock; pthread_mutex_t current_job_lock;
unsigned current_execute;
int current_job; int current_job;
unsigned int current_execute;
int done; int done;
} ThreadContext; } ThreadContext;
@@ -151,8 +151,8 @@ static void* attribute_align_arg worker(void *v)
{ {
AVCodecContext *avctx = v; AVCodecContext *avctx = v;
ThreadContext *c = avctx->thread_opaque; ThreadContext *c = avctx->thread_opaque;
unsigned last_execute = 0;
int our_job = c->job_count; int our_job = c->job_count;
int last_execute = 0;
int thread_count = avctx->thread_count; int thread_count = avctx->thread_count;
int self_id; int self_id;