[FFmpeg-cvslog] threads: move state update after progress cleanup.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 11 20:13:23 2012 +0100| [6be0960851d41bb1aa2c9bebcbad45f715de939a] | committer: Michael Niedermayer

threads: move state update after progress cleanup.

This order is more logic and might prevent a race.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/pthread.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 6ae763d..0e64a32 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -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);