[x264-devel] commit: Fix 8x8dct+slices+no sliced threads+cavlc+deblock ( Jason Garrett-Glaser )

[git at videolan.org]

x264 | branch: stable | Jason Garrett-Glaser <darkshikari at gmail.com> | Wed Jul 14 18:47:14 2010 -0700| [c953140b3b622b33e892c1a3d327d35b74762293] | committer: Jason Garrett-Glaser 

Fix 8x8dct+slices+no sliced threads+cavlc+deblock
Deblocking was done slightly incorrectly.
Regression in r1612.

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

 common/macroblock.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/common/macroblock.c b/common/macroblock.c
index f0a624f..ebff1c5 100644
--- a/common/macroblock.c
+++ b/common/macroblock.c
@@ -929,6 +929,7 @@ void x264_macroblock_cache_load_deblock( x264_t *h )
         int mb_x = h->mb.i_mb_x;
         int mb_y = h->mb.i_mb_y;
         x264_macroblock_cache_load_neighbours_deblock( h, mb_x, mb_y );
+        int new_neighbour = h->mb.i_neighbour;
         h->mb.i_neighbour &= ~old_neighbour;
         if( h->mb.i_neighbour )
         {
@@ -984,6 +985,7 @@ void x264_macroblock_cache_load_deblock( x264_t *h )
                 }
             }
         }
+        h->mb.i_neighbour = new_neighbour;
     }
 
     if( h->param.analyse.i_weighted_pred && h->sh.i_type == SLICE_TYPE_P )