apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-31 12:36:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

threads: move state update after progress cleanup.

Browse Source 
This order is more logic and might prevent a race.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-02-11 20:13:23 +01:00
parent f900d60178
commit 6be0960851
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

@@ -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); if (p->state == STATE_SETTING_UP) ff_thread_finish_setup(avctx);
p->state = STATE_INPUT_READY;
pthread_mutex_lock(&p->progress_mutex); pthread_mutex_lock(&p->progress_mutex);
for (i = 0; i < MAX_BUFFERS; i++) for (i = 0; i < MAX_BUFFERS; i++)
if (p->progress_used[i]) { if (p->progress_used[i]) {
p->progress[i][0] = INT_MAX; p->progress[i][0] = INT_MAX;
p->progress[i][1] = INT_MAX; p->progress[i][1] = INT_MAX;
} }
p->state = STATE_INPUT_READY;
pthread_cond_broadcast(&p->progress_cond); pthread_cond_broadcast(&p->progress_cond);
pthread_cond_signal(&p->output_cond); pthread_cond_signal(&p->output_cond);
pthread_mutex_unlock(&p->progress_mutex); pthread_mutex_unlock(&p->progress_mutex);