[x264-devel] commit: Fix rare deadlock introduced in weightp (Jason Garrett-Glaser )

[git version control]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Sat Nov 14 18:40:22 2009 -0800| [e76a4adb1c8ee27748847656450c815f60d2fe6d] | committer: Jason Garrett-Glaser 

Fix rare deadlock introduced in weightp

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

 encoder/analyse.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/encoder/analyse.c b/encoder/analyse.c
index 48499e1..f88052c 100644
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -378,8 +378,7 @@ static void x264_mb_analyse_init( x264_t *h, x264_mb_analysis_t *a, int i_qp )
                     for( j=0; j<i_ref; j++ )
                     {
                         x264_frame_cond_wait( fref[j]->orig, thresh );
-                        fref[j]->i_lines_completed = fref[j]->orig->i_lines_completed;
-                        thread_mvy_range = X264_MIN( thread_mvy_range, fref[j]->i_lines_completed - pix_y );
+                        thread_mvy_range = X264_MIN( thread_mvy_range, fref[j]->orig->i_lines_completed - pix_y );
                     }
                 }