[x264-devel] commit: Fix 10l in cache_load changes (Jason Garrett-Glaser )

[git at videolan.org]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Tue Apr 20 16:53:06 2010 -0700| [4ce8f1232358004cd16f3f83c3dd81e87707ff56] | committer: Jason Garrett-Glaser 

Fix 10l in cache_load changes
Broke constrained intra pred, probably not anything else.

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

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

diff --git a/common/macroblock.c b/common/macroblock.c
index c54a4dd..514243f 100644
--- a/common/macroblock.c
+++ b/common/macroblock.c
@@ -1033,7 +1033,7 @@ static void inline x264_macroblock_cache_load_neighbours( x264_t *h, int mb_x, i
         {
             h->mb.i_neighbour_frame |= MB_TOPLEFT;
             h->mb.i_mb_topleft_xy = top - 1;
-            h->mb.i_mb_type_topright = h->mb.type[h->mb.i_mb_topleft_xy];
+            h->mb.i_mb_type_topleft = h->mb.type[h->mb.i_mb_topleft_xy];
             if( top - 1 >= h->sh.i_first_mb )
             {
                 h->mb.i_neighbour |= MB_TOPLEFT;
@@ -1047,7 +1047,7 @@ static void inline x264_macroblock_cache_load_neighbours( x264_t *h, int mb_x, i
         {
             h->mb.i_neighbour_frame |= MB_TOPRIGHT;
             h->mb.i_mb_topright_xy = top + 1;
-            h->mb.i_mb_type_topleft = h->mb.type[h->mb.i_mb_topright_xy];
+            h->mb.i_mb_type_topright = h->mb.type[h->mb.i_mb_topright_xy];
             if( top + 1 >= h->sh.i_first_mb )
             {
                 h->mb.i_neighbour |= MB_TOPRIGHT;