summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2015-08-03 18:43:55 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-08-03 18:43:55 +0000
commit9d9273726b3cab8f09d0b0b29ce83b0756be012f (patch)
treed9df34029b6284c38ff218ba9808057212f40216
parenta68356202d3f4c75194b5ae0efc7facb078cefea (diff)
parent8f089cbd2ec3899127817c21f137b03844b2e519 (diff)
downloadlibvpx-9d9273726b3cab8f09d0b0b29ce83b0756be012f.tar
libvpx-9d9273726b3cab8f09d0b0b29ce83b0756be012f.tar.gz
libvpx-9d9273726b3cab8f09d0b0b29ce83b0756be012f.tar.bz2
libvpx-9d9273726b3cab8f09d0b0b29ce83b0756be012f.zip
Merge "Correct the allocation size for ssim_vars"
-rw-r--r--vp9/encoder/vp9_encoder.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index 8aee22756..718480131 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -1709,7 +1709,8 @@ VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf,
}
if (cpi->b_calculate_consistency) {
- cpi->ssim_vars = vpx_malloc(sizeof(*cpi->ssim_vars)*720*480);
+ cpi->ssim_vars = vpx_malloc(sizeof(*cpi->ssim_vars) *
+ 4 * cpi->common.mi_rows * cpi->common.mi_cols);
cpi->worst_consistency = 100.0;
}