From: Fiona Glaser <fiona@x264.com>
Date: Thu, 26 Feb 2009 20:07:56 +0000 (-0800)
Subject: Fix regression in r1085
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2669f7ddf56b34240248ea02a8c7f8309e2b4610;p=libx264

Fix regression in r1085
Deblocking was very slightly incorrect with partitions=all.
Bug found by BugMaster.
---

diff --git a/common/frame.c b/common/frame.c
index 08ddd451..bd7ad45c 100644
--- a/common/frame.c
+++ b/common/frame.c
@@ -625,6 +625,7 @@ void x264_frame_deblock_row( x264_t *h, int mb_y )
     const int b_interlaced = h->sh.b_mbaff;
     const int mvy_limit = 4 >> b_interlaced;
     const int qp_thresh = 15 - X264_MIN(h->sh.i_alpha_c0_offset, h->sh.i_beta_offset) - X264_MAX(0, h->param.analyse.i_chroma_qp_offset);
+    const int no_sub8x8 = !(h->param.analyse.inter & X264_ANALYSE_PSUB8x8);
     int mb_x;
     int stridey   = h->fdec->i_stride[0];
     int stride2y  = stridey << b_interlaced;
@@ -642,7 +643,6 @@ void x264_frame_deblock_row( x264_t *h, int mb_y )
         const int b_8x8_transform = h->mb.mb_transform_size[mb_xy];
         const int i_qp = h->mb.qp[mb_xy];
         int i_edge_end = (h->mb.type[mb_xy] == P_SKIP) ? 1 : 4;
-        int no_sub8x8 = h->mb.type[mb_xy] != P_8x8 || !(h->param.analyse.inter & X264_ANALYSE_PSUB8x8);
         uint8_t *pixy = h->fdec->plane[0] + 16*mb_y*stridey  + 16*mb_x;
         uint8_t *pixu = h->fdec->plane[1] +  8*mb_y*strideuv +  8*mb_x;
         uint8_t *pixv = h->fdec->plane[2] +  8*mb_y*strideuv +  8*mb_x;