From ed09580777ead6cb36ef1b227a25424034f38bb8 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Tue, 13 May 2014 10:07:45 -0700 Subject: [PATCH] vp9_decodeframe.c: cleanup -wextra warnings Change-Id: I0315cea6a5e58182bc2556e9825ec2ef0b1480c3 --- vp9/common/vp9_common.h | 2 +- vp9/decoder/vp9_decodeframe.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/vp9/common/vp9_common.h b/vp9/common/vp9_common.h index 2dccb70..04db7c0 100644 --- a/vp9/common/vp9_common.h +++ b/vp9/common/vp9_common.h @@ -45,7 +45,7 @@ extern "C" { vpx_memcpy(dest, src, n * sizeof(*src)); \ } -#define vp9_zero(dest) vpx_memset(&dest, 0, 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) { diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 9dc0cf1..169e939 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -1279,6 +1279,7 @@ static struct vp9_read_bit_buffer* init_read_bit_buffer( const uint8_t *data, const uint8_t *data_end, uint8_t *clear_data /* buffer size MAX_VP9_HEADER_SIZE */) { + vp9_zero(*rb); rb->bit_offset = 0; rb->error_handler = error_handler; rb->error_handler_data = &pbi->common; @@ -1299,7 +1300,7 @@ int vp9_decode_frame(VP9Decoder *pbi, const uint8_t **p_data_end) { VP9_COMMON *const cm = &pbi->common; MACROBLOCKD *const xd = &pbi->mb; - struct vp9_read_bit_buffer rb = { 0 }; + struct vp9_read_bit_buffer rb; uint8_t clear_data[MAX_VP9_HEADER_SIZE]; const size_t first_partition_size = read_uncompressed_header(pbi, init_read_bit_buffer(pbi, &rb, data, data_end, clear_data)); -- 2.7.4