Browse Source

threads: move state update after progress cleanup.

This order is more logic and might prevent a race.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.11
Michael Niedermayer 13 years ago
parent
commit
6be0960851
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavcodec/pthread.c

+ 2
- 2
libavcodec/pthread.c View File

@@ -386,14 +386,14 @@ static attribute_align_arg void *frame_worker_thread(void *arg)

if (p->state == STATE_SETTING_UP) ff_thread_finish_setup(avctx);

p->state = STATE_INPUT_READY;

pthread_mutex_lock(&p->progress_mutex);
for (i = 0; i < MAX_BUFFERS; i++)
if (p->progress_used[i]) {
p->progress[i][0] = INT_MAX;
p->progress[i][1] = INT_MAX;
}
p->state = STATE_INPUT_READY;

pthread_cond_broadcast(&p->progress_cond);
pthread_cond_signal(&p->output_cond);
pthread_mutex_unlock(&p->progress_mutex);


Loading…
Cancel
Save