diff --git a/src/dec/vp8.c b/src/dec/vp8.c index 225b4f75..e8dd6977 100644 --- a/src/dec/vp8.c +++ b/src/dec/vp8.c @@ -526,7 +526,8 @@ static const PackedNz kUnpackTab[16] = { static int ParseResiduals(VP8Decoder* const dec, VP8MB* const mb, VP8BitReader* const token_br) { - int out_t_nz, out_l_nz, first; + uint32_t out_t_nz, out_l_nz; + int first; ProbaArray ac_prob; const VP8QuantMatrix* const q = &dec->dqm_[dec->segment_]; int16_t* dst = dec->coeffs_; diff --git a/src/dec/vp8i.h b/src/dec/vp8i.h index ae91c6d8..6cb47390 100644 --- a/src/dec/vp8i.h +++ b/src/dec/vp8i.h @@ -157,10 +157,9 @@ typedef struct { // filter specs uint8_t pad_; // mostly needed for struct aligning on ARM } VP8FInfo; -typedef struct { // used for syntax-parsing - unsigned int nz_:24; // non-zero AC/DC coeffs (24bit) - unsigned int nz_dc_:1; // non-zero DC coeffs - unsigned int pad_:7; +typedef struct { // Top/Left Contexts used for syntax-parsing + uint8_t nz_; // non-zero AC/DC coeffs (4bit for luma + 4bit for chroma) + uint8_t nz_dc_; // non-zero DC coeff (1bit) } VP8MB; // Dequantization matrices