shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "rdopt: quiet -Warray-bounds warnings"

--- a/vp8/encoder/rdopt.c

+++ b/vp8/encoder/rdopt.c

@@ -528,18 +528,15 @@

     VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l);

-# define QC( I)  ( qcoeff_ptr [vp8_default_zig_zag1d[I]] )

-

+    assert(eob <= 16);

     for (; c < eob; c++)

     {

-        int v = QC(c);

-        int t = vp8_dct_value_tokens_ptr[v].Token;

+        const int v = qcoeff_ptr[vp8_default_zig_zag1d[c]];

+        const int t = vp8_dct_value_tokens_ptr[v].Token;

         cost += mb->token_costs [type] [vp8_coef_bands[c]] [pt] [t];

         cost += vp8_dct_value_cost_ptr[v];

         pt = vp8_prev_token_class[t];

     }

-

-# undef QC

     if (c < 16)

         cost += mb->token_costs [type] [vp8_coef_bands[c]] [pt] [DCT_EOB_TOKEN];