diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-03-28 11:23:44 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-03-28 11:23:44 -0700 |
| commit | e071fe15b20f73014b529f1ef3bdf66f55aec023 (patch) | |
| tree | 15277ce470c8c963b45a729a50ed0add48ec791f /vp9/encoder | |
| parent | ed78d1439f7bb73110221e4a8876d1fc1c759f6c (diff) | |
| parent | befb0393c5eb835a8aa53d101edc204d80400048 (diff) | |
| download | libvpx-e071fe15b20f73014b529f1ef3bdf66f55aec023.tar libvpx-e071fe15b20f73014b529f1ef3bdf66f55aec023.tar.gz libvpx-e071fe15b20f73014b529f1ef3bdf66f55aec023.tar.bz2 libvpx-e071fe15b20f73014b529f1ef3bdf66f55aec023.zip | |
Merge "Fix crash when --tune=ssim is selected." into experimental
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 |