shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Make vp9_zero use cases of consistent format"

--- a/vp9/common/vp9_common.h

+++ b/vp9/common/vp9_common.h

@@ -40,8 +40,8 @@

     vpx_memcpy(dest, src, n * sizeof(*src)); \

   }

-#define vp9_zero(dest) vpx_memset(&dest, 0, sizeof(dest));

-#define vp9_zero_array(dest, n) vpx_memset(dest, 0, n * sizeof(*dest));

+#define vp9_zero(dest) vpx_memset(&dest, 0, sizeof(dest))

+#define vp9_zero_array(dest, n) vpx_memset(dest, 0, n * sizeof(*dest))

 static INLINE uint8_t clip_pixel(int val) {

   return (val > 255) ? 255u : (val < 0) ? 0u : val;

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -1830,9 +1830,9 @@

   xd->this_mi->mbmi.mode = DC_PRED;

   xd->this_mi->mbmi.uv_mode = DC_PRED;

-  vp9_zero(cpi->y_mode_count)

-  vp9_zero(cpi->y_uv_mode_count)

-  vp9_zero(cm->counts.inter_mode)

+  vp9_zero(cpi->y_mode_count);

+  vp9_zero(cpi->y_uv_mode_count);

+  vp9_zero(cm->counts.inter_mode);

   vp9_zero(cpi->partition_count);

   vp9_zero(cpi->intra_inter_count);

   vp9_zero(cpi->comp_inter_count);

--- a/vp9/encoder/vp9_onyx_if.c

+++ b/vp9/encoder/vp9_onyx_if.c

@@ -1731,7 +1731,7 @@

   cpi->common.error.setjmp = 0;

-  vp9_zero(cpi->y_uv_mode_count)

+  vp9_zero(cpi->y_uv_mode_count);

 #ifdef MODE_TEST_HIT_STATS

   vp9_zero(cpi->mode_test_hits)