shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes I4e2aeaef,Ie3e478ef

* changes:
  vpxdec warning errors addressed
  cast enums to int to avoid gcc warning in pred_common

--- a/vp9/common/vp9_pred_common.c

+++ b/vp9/common/vp9_pred_common.c

@@ -353,9 +353,9 @@

   const MB_MODE_INFO *const left_mbmi = get_mbmi(get_left_mi(xd));

   const int has_above = above_mbmi != NULL;

   const int has_left = left_mbmi != NULL;

-  int above_ctx = (has_above && !above_mbmi->skip) ? above_mbmi->tx_size

+  int above_ctx = (has_above && !above_mbmi->skip) ? (int)above_mbmi->tx_size

                                                    : max_tx_size;

-  int left_ctx = (has_left && !left_mbmi->skip) ? left_mbmi->tx_size

+  int left_ctx = (has_left && !left_mbmi->skip) ? (int)left_mbmi->tx_size

                                                 : max_tx_size;

   if (!has_left)

     left_ctx = above_ctx;

--- a/vpxdec.c

+++ b/vpxdec.c

@@ -425,6 +425,7 @@

           break;

         default:

           die("Unrecognized pattern %%%c\n", p[1]);

+          break;

       }

       pat_len = strlen(q);

@@ -511,7 +512,7 @@

   int                     use_y4m = 1;

   int                     opt_yv12 = 0;

   int                     opt_i420 = 0;

-  vpx_codec_dec_cfg_t     cfg = {0};

+  vpx_codec_dec_cfg_t     cfg = {0, 0, 0};

 #if CONFIG_VP8_DECODER

   vp8_postproc_cfg_t      vp8_pp_cfg = {0};

   int                     vp8_dbg_color_ref_frame = 0;

@@ -525,7 +526,7 @@

   vpx_image_t             *scaled_img = NULL;

   int                     frame_avail, got_data;

   int                     num_external_frame_buffers = 0;

-  struct ExternalFrameBufferList ext_fb_list = {0};

+  struct ExternalFrameBufferList ext_fb_list = {0, NULL};

   const char *outfile_pattern = NULL;

   char outfile_name[PATH_MAX] = {0};

@@ -534,10 +535,10 @@

   MD5Context md5_ctx;

   unsigned char md5_digest[16];

-  struct VpxDecInputContext input = {0};

-  struct VpxInputContext vpx_input_ctx = {0};

+  struct VpxDecInputContext input = {NULL, NULL};

+  struct VpxInputContext vpx_input_ctx;

 #if CONFIG_WEBM_IO

-  struct WebmInputContext webm_ctx = {0};

+  struct WebmInputContext webm_ctx;

   input.webm_ctx = &webm_ctx;

 #endif

   input.vpx_input_ctx = &vpx_input_ctx;