shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: fix -Wclobbered (longjmp + local variables)"

--- a/vp9/decoder/vp9_decoder.c

+++ b/vp9/decoder/vp9_decoder.c

@@ -63,8 +63,8 @@

 }

 VP9Decoder *vp9_decoder_create() {

-  VP9Decoder *const pbi = vpx_memalign(32, sizeof(*pbi));

-  VP9_COMMON *const cm = pbi ? &pbi->common : NULL;

+  VP9Decoder *volatile const pbi = vpx_memalign(32, sizeof(*pbi));

+  VP9_COMMON *volatile const cm = pbi ? &pbi->common : NULL;

   if (!cm)

     return NULL;

@@ -243,7 +243,7 @@

 int vp9_receive_compressed_data(VP9Decoder *pbi,

                                 size_t size, const uint8_t **psource) {

-  VP9_COMMON *const cm = &pbi->common;

+  VP9_COMMON *volatile const cm = &pbi->common;

   const uint8_t *source = *psource;

   int retcode = 0;

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -1394,8 +1394,8 @@

 VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf) {

   unsigned int i;

-  VP9_COMP *const cpi = vpx_memalign(32, sizeof(VP9_COMP));

-  VP9_COMMON *const cm = cpi != NULL ? &cpi->common : NULL;

+  VP9_COMP *volatile const cpi = vpx_memalign(32, sizeof(VP9_COMP));

+  VP9_COMMON *volatile const cm = cpi != NULL ? &cpi->common : NULL;

   if (!cm)

     return NULL;