[x264-devel] commit: fix a race condition at the end of thread_input (Loren Merritt )

[git version control]

x264 | branch: master | Loren Merritt <pengvado at akuvian.org> | Tue May 19 02:47:15 2009 +0000| [7b6ce6a005f791f1d82c369d2f1e1c30b9ccbe80] | committer: Loren Merritt 

fix a race condition at the end of thread_input

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=7b6ce6a005f791f1d82c369d2f1e1c30b9ccbe80
---

 muxers.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/muxers.c b/muxers.c
index 2eae1eb..d62be5c 100644
--- a/muxers.c
+++ b/muxers.c
@@ -505,10 +505,10 @@ int read_frame_thread( x264_picture_t *p_pic, hnd_t handle, int i_frame )
 int close_file_thread( hnd_t handle )
 {
     thread_input_t *h = handle;
-    h->p_close_infile( h->p_handle );
-    x264_picture_clean( &h->pic );
     if( h->in_progress )
         x264_pthread_join( h->tid, NULL );
+    h->p_close_infile( h->p_handle );
+    x264_picture_clean( &h->pic );
     free( h->next_args );
     free( h );
     return 0;