diff options
| author | Jingning Han <jingning@google.com> | 2013-10-15 16:49:05 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-10-15 16:49:05 -0700 |
| commit | 9b05f23e05028315a1f1074b52bab49cff39b7a1 (patch) | |
| tree | 91b03141bcbab6691f2be09e790304a9e13abd4b /vp9 | |
| parent | 355db167347bc9f6f29cbea440838fd0d3be019d (diff) | |
| parent | c8e48f4b02d6e810f271e46fd1d70d841bd9eb85 (diff) | |
| download | libvpx-9b05f23e05028315a1f1074b52bab49cff39b7a1.tar libvpx-9b05f23e05028315a1f1074b52bab49cff39b7a1.tar.gz libvpx-9b05f23e05028315a1f1074b52bab49cff39b7a1.tar.bz2 libvpx-9b05f23e05028315a1f1074b52bab49cff39b7a1.zip | |
Merge "Make vp9_zero use cases of consistent format"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_common.h | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 6 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/vp9/common/vp9_common.h b/vp9/common/vp9_common.h index 179690652..3ac192b4a 100644 --- 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; diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index ead867b8d..41bf17a37 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1830,9 +1830,9 @@ static void init_encode_frame_mb_context(VP9_COMP *cpi) { 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); diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 0afb35f54..28a905057 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -1731,7 +1731,7 @@ VP9_PTR vp9_create_compressor(VP9_CONFIG *oxcf) { 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) |