Commit 3726d45d authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge "sad_test: initialize bit_depth_ in all cases"

parents 681d5e90 65d7fa71
...@@ -140,6 +140,8 @@ class SADTestBase : public ::testing::Test { ...@@ -140,6 +140,8 @@ class SADTestBase : public ::testing::Test {
reference_data_ = CONVERT_TO_BYTEPTR(reference_data16_); reference_data_ = CONVERT_TO_BYTEPTR(reference_data16_);
second_pred_ = CONVERT_TO_BYTEPTR(second_pred16_); second_pred_ = CONVERT_TO_BYTEPTR(second_pred16_);
} }
#else
bit_depth_ = VPX_BITS_8;
#endif #endif
mask_ = (1 << bit_depth_) - 1; mask_ = (1 << bit_depth_) - 1;
source_stride_ = (width_ + 31) & ~31; source_stride_ = (width_ + 31) & ~31;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment