From: Fiona Glaser <fiona@x264.com>
Date: Sun, 15 Nov 2009 02:40:22 +0000 (-0800)
Subject: Fix rare deadlock introduced in weightp
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b9ce3a10bacb32af12756d4104d7d8ef255c140a;p=libx264

Fix rare deadlock introduced in weightp
---

diff --git a/encoder/analyse.c b/encoder/analyse.c
index 07cf5a7c..55dbfa02 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 );
                     }
                 }