[x264-devel] commit: 100l in deadlock fix (Jason Garrett-Glaser )

git version control git at videolan.org
Sun Nov 15 04:59:46 CET 2009


x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Sat Nov 14 19:58:46 2009 -0800| [82b80ef96b0ae74187f6f6a482bddb3f859df4f5] | committer: Jason Garrett-Glaser 

100l in deadlock fix

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

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

diff --git a/encoder/analyse.c b/encoder/analyse.c
index f88052c..833ed5d 100644
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -3154,7 +3154,7 @@ static void x264_analyse_update_cache( x264_t *h, x264_mb_analysis_t *a  )
             int ref = h->mb.cache.ref[l][x264_scan8[0]];
             if( ref < 0 )
                 continue;
-            completed = (l ? h->fref1 : h->fref0)[ ref >> h->mb.b_interlaced ]->i_lines_completed;
+            completed = (l ? h->fref1 : h->fref0)[ ref >> h->mb.b_interlaced ]->orig->i_lines_completed;
             if( (h->mb.cache.mv[l][x264_scan8[15]][1] >> (2 - h->mb.b_interlaced)) + h->mb.i_mb_y*16 > completed )
             {
                 x264_log( h, X264_LOG_WARNING, "internal error (MV out of thread range)\n");



More information about the x264-devel mailing list