shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Silent -wextra warnings"

--- a/vpxenc.c

+++ b/vpxenc.c

@@ -965,8 +965,8 @@

               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 @@

   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 stream_cnt = 0;

   int res = 0;

+  memset(&input, 0, sizeof(input));

   exec_name = argv_[0];

   if (argc < 3)

--- a/y4minput.c

+++ b/y4minput.c

@@ -683,6 +683,7 @@

 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 @@

 /*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,