From: Paul Wilkins <paulwilkins@google.com>
Date: Tue, 26 Mar 2013 13:11:52 +0000 (+0000)
Subject: Fix crash when --tune=ssim is selected.
X-Git-Tag: v1.3.0~1151^2~9^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=befb0393c5eb835a8aa53d101edc204d80400048;p=libvpx

Fix crash when --tune=ssim is selected.

Crash fix only. No functional change or testing.

Change-Id: I0c6d114d024c29fc11ae61666f5938f11b01dd6a
---

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index fc95c3274..f2a13de99 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -198,7 +198,7 @@ static void calc_av_activity(VP9_COMP *cpi, int64_t activity_sum) {
 #define OUTPUT_NORM_ACT_STATS   0
 
 #if USE_ACT_INDEX
-// Calculate and activity index for each mb
+// Calculate an activity index for each mb
 static void calc_activity_index(VP9_COMP *cpi, MACROBLOCK *x) {
   VP9_COMMON *const cm = &cpi->common;
   int mb_row, mb_col;
@@ -268,6 +268,8 @@ static void build_activity_map(VP9_COMP *cpi) {
   unsigned int mb_activity;
   int64_t activity_sum = 0;
 
+  x->mb_activity_ptr = cpi->mb_activity_map;
+
   // for each macroblock row in image
   for (mb_row = 0; mb_row < cm->mb_rows; mb_row++) {
 #if ALT_ACT_MEASURE