summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2014-08-22 19:44:58 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-08-22 19:44:58 -0700
commit08ff6a27bac43a5c57bd0d5dd4905bbb11496c25 (patch)
treea376968038b05dfa222338ae2b2194b2c8e48060
parentbf212edc101fe9d8dbacf44b6be1c0667fc1aebc (diff)
parentb070d7021d70184eb7e3519c39762df23571d2bd (diff)
downloadlibvpx-08ff6a27bac43a5c57bd0d5dd4905bbb11496c25.tar
libvpx-08ff6a27bac43a5c57bd0d5dd4905bbb11496c25.tar.gz
libvpx-08ff6a27bac43a5c57bd0d5dd4905bbb11496c25.tar.bz2
libvpx-08ff6a27bac43a5c57bd0d5dd4905bbb11496c25.zip
Merge "active_map_test: use vpx_active_map_t() to initialize vars"
-rw-r--r--test/active_map_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/active_map_test.cc b/test/active_map_test.cc
index a9bb54090..022199519 100644
--- a/test/active_map_test.cc
+++ b/test/active_map_test.cc
@@ -38,7 +38,7 @@ class ActiveMapTest
if (video->frame() == 1) {
encoder->Control(VP8E_SET_CPUUSED, cpu_used_);
} else if (video->frame() == 3) {
- vpx_active_map_t map = {0};
+ vpx_active_map_t map = vpx_active_map_t();
uint8_t active_map[9 * 13] = {
1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0,
1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0,
@@ -57,7 +57,7 @@ class ActiveMapTest
map.active_map = active_map;
encoder->Control(VP8E_SET_ACTIVEMAP, &map);
} else if (video->frame() == 15) {
- vpx_active_map_t map = {0};
+ vpx_active_map_t map = vpx_active_map_t();
map.cols = (kWidth + 15) / 16;
map.rows = (kHeight + 15) / 16;
map.active_map = NULL;