From 618e7ef00ebcfa7ea89f7081c7d67486acc0cdc4 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Fri, 11 Jul 2014 16:27:21 -0700 Subject: [PATCH] Silent -wextra warnings 1. vpxenc.c 2. y4minput.c Change-Id: I1cfe1ef84a3eec11376976c09947fe6178ee039f --- vpxenc.c | 7 ++++--- y4minput.c | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/vpxenc.c b/vpxenc.c index fce6807..ea13b27 100644 --- a/vpxenc.c +++ b/vpxenc.c @@ -965,8 +965,8 @@ static int parse_stream_params(struct VpxEncoderConfig *global, break; /* Update/insert */ - assert(j < ARG_CTRL_CNT_MAX); - if (j < ARG_CTRL_CNT_MAX) { + assert(j < (int)ARG_CTRL_CNT_MAX); + if (j < (int)ARG_CTRL_CNT_MAX) { config->arg_ctrls[j][0] = ctrl_args_map[i]; config->arg_ctrls[j][1] = arg_parse_enum_or_int(&arg); if (j == config->arg_ctrl_cnt) @@ -1517,7 +1517,7 @@ int main(int argc, const char **argv_) { vpx_image_t raw; int frame_avail, got_data; - struct VpxInputContext input = {0}; + struct VpxInputContext input; struct VpxEncoderConfig global; struct stream_state *streams = NULL; char **argv, **argi; @@ -1525,6 +1525,7 @@ int main(int argc, const char **argv_) { int stream_cnt = 0; int res = 0; + memset(&input, 0, sizeof(input)); exec_name = argv_[0]; if (argc < 3) diff --git a/y4minput.c b/y4minput.c index b005b71..520c332 100644 --- a/y4minput.c +++ b/y4minput.c @@ -683,6 +683,7 @@ static void y4m_convert_444_420jpeg(y4m_input *_y4m, unsigned char *_dst, static void y4m_convert_mono_420jpeg(y4m_input *_y4m, unsigned char *_dst, unsigned char *_aux) { int c_sz; + (void)_aux; _dst += _y4m->pic_w * _y4m->pic_h; c_sz = ((_y4m->pic_w + _y4m->dst_c_dec_h - 1) / _y4m->dst_c_dec_h) * ((_y4m->pic_h + _y4m->dst_c_dec_v - 1) / _y4m->dst_c_dec_v); @@ -692,6 +693,9 @@ static void y4m_convert_mono_420jpeg(y4m_input *_y4m, unsigned char *_dst, /*No conversion function needed.*/ static void y4m_convert_null(y4m_input *_y4m, unsigned char *_dst, unsigned char *_aux) { + (void)_y4m; + (void)_dst; + (void)_aux; } int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip, -- 2.7.4