Merge commit '62de77ffcaebd42fe685b8426da56b89b2532318'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 17:56:07 +0000 (18:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 17:59:06 +0000 (18:59 +0100)
* commit '62de77ffcaebd42fe685b8426da56b89b2532318':
  vorbis: Use a local codebook variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/vorbisdec.c

@@@ -1321,12 -1305,11 +1321,13 @@@ static av_always_inline int setup_class
                                             vorbis_residue *vr,
                                             uint8_t *do_not_decode,
                                             unsigned ch_used,
 -                                           int partition_count)
 +                                           int partition_count,
 +                                           int ptns_to_read
 +                                          )
  {
+     vorbis_codebook *codebook = vc->codebooks + vr->classbook;
      int p, j, i;
-     unsigned c_p_c         = vc->codebooks[vr->classbook].dimensions;
+     unsigned c_p_c         = codebook->dimensions;
      unsigned inverse_class = ff_inverse[vr->classifications];
      unsigned temp, temp2;
      for (p = 0, j = 0; j < ch_used; ++j) {