Commit 618e7ef0 authored by Yaowu Xu's avatar Yaowu Xu

Silent -wextra warnings

1. vpxenc.c
2. y4minput.c

Change-Id: I1cfe1ef84a3eec11376976c09947fe6178ee039f
parent 6673d2f3
...@@ -965,8 +965,8 @@ static int parse_stream_params(struct VpxEncoderConfig *global, ...@@ -965,8 +965,8 @@ static int parse_stream_params(struct VpxEncoderConfig *global,
break; break;
/* Update/insert */ /* Update/insert */
assert(j < ARG_CTRL_CNT_MAX); assert(j < (int)ARG_CTRL_CNT_MAX);
if (j < ARG_CTRL_CNT_MAX) { if (j < (int)ARG_CTRL_CNT_MAX) {
config->arg_ctrls[j][0] = ctrl_args_map[i]; config->arg_ctrls[j][0] = ctrl_args_map[i];
config->arg_ctrls[j][1] = arg_parse_enum_or_int(&arg); config->arg_ctrls[j][1] = arg_parse_enum_or_int(&arg);
if (j == config->arg_ctrl_cnt) if (j == config->arg_ctrl_cnt)
...@@ -1517,7 +1517,7 @@ int main(int argc, const char **argv_) { ...@@ -1517,7 +1517,7 @@ int main(int argc, const char **argv_) {
vpx_image_t raw; vpx_image_t raw;
int frame_avail, got_data; int frame_avail, got_data;
struct VpxInputContext input = {0}; struct VpxInputContext input;
struct VpxEncoderConfig global; struct VpxEncoderConfig global;
struct stream_state *streams = NULL; struct stream_state *streams = NULL;
char **argv, **argi; char **argv, **argi;
...@@ -1525,6 +1525,7 @@ int main(int argc, const char **argv_) { ...@@ -1525,6 +1525,7 @@ int main(int argc, const char **argv_) {
int stream_cnt = 0; int stream_cnt = 0;
int res = 0; int res = 0;
memset(&input, 0, sizeof(input));
exec_name = argv_[0]; exec_name = argv_[0];
if (argc < 3) if (argc < 3)
......
...@@ -683,6 +683,7 @@ static void y4m_convert_444_420jpeg(y4m_input *_y4m, unsigned char *_dst, ...@@ -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, static void y4m_convert_mono_420jpeg(y4m_input *_y4m, unsigned char *_dst,
unsigned char *_aux) { unsigned char *_aux) {
int c_sz; int c_sz;
(void)_aux;
_dst += _y4m->pic_w * _y4m->pic_h; _dst += _y4m->pic_w * _y4m->pic_h;
c_sz = ((_y4m->pic_w + _y4m->dst_c_dec_h - 1) / _y4m->dst_c_dec_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); ((_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, ...@@ -692,6 +693,9 @@ static void y4m_convert_mono_420jpeg(y4m_input *_y4m, unsigned char *_dst,
/*No conversion function needed.*/ /*No conversion function needed.*/
static void y4m_convert_null(y4m_input *_y4m, unsigned char *_dst, static void y4m_convert_null(y4m_input *_y4m, unsigned char *_dst,
unsigned char *_aux) { unsigned char *_aux) {
(void)_y4m;
(void)_dst;
(void)_aux;
} }
int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip, int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment