[x264-devel] commit: Fix regression in r1501. (Anton Mitrofanov )

[git at videolan.org]

x264 | branch: stable | Anton Mitrofanov <BugMaster at narod.ru> | Thu Jun 10 21:33:46 2010 +0400| [0c7bcebdfb8baca78e4fd9dc76f5f43e096c6030] | committer: Jason Garrett-Glaser 

Fix regression in r1501.
Could cause slightly incorrect analysis in rare cases, but no serious encoding issues.
Also shut up gcc warning about pels_v.

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

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

diff --git a/encoder/analyse.c b/encoder/analyse.c
index 84a553d..696c78f 100644
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -720,7 +720,8 @@ static void x264_mb_analyse_intra( x264_t *h, x264_mb_analysis_t *a, int i_satd_
                 satd[i_pred_mode] -= 3 * lambda;
                 for( int i = 2; i >= 0; i-- )
                 {
-                    int cost = a->i_satd_i8x8_dir[i][idx] = satd[i];
+                    int cost = satd[i];
+                    a->i_satd_i8x8_dir[i][idx] = cost + 4 * lambda;
                     COPY2_IF_LT( i_best, cost, a->i_predict8x8[idx], i );
                 }
 
@@ -1038,7 +1039,7 @@ static void x264_intra_rd_refine( x264_t *h, x264_mb_analysis_t *a )
         for( int idx = 0; idx < 4; idx++ )
         {
             pixel4 pels_h[2] = {0};
-            pixel pels_v[7];
+            pixel pels_v[7] = {0};
             uint16_t i_nnz[2] = {0}; //shut up gcc
             pixel *p_dst_by;
             int cbp_luma_new = 0;