Merge commit '98186578a2a21af5bfe6dd71d222dc270f763c7d'

* commit '98186578a2a21af5bfe6dd71d222dc270f763c7d':
  vorbis: refactor vorbis_residue_decode_internal

Conflicts:
	libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/vorbisdec.c
index ba5b1a3,60c7192..b7e676f
--- 1/libavcodec/vorbisdec.c
--- 2/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@@ -1313,6 -1302,37 +1313,37 @@@ static int vorbis_floor1_decode(vorbis_
      return 0;
  }
  
 -            assert(vr->classifications > 1 && temp <= 65536); //needed for inverse[]
+ static av_always_inline int setup_classifs(vorbis_context *vc,
+                                            vorbis_residue *vr,
+                                            uint8_t *do_not_decode,
+                                            unsigned ch_used,
+                                            unsigned partition_count)
+ {
+     int p, j, i;
+     unsigned c_p_c         = vc->codebooks[vr->classbook].dimensions;
+     unsigned inverse_class = ff_inverse[vr->classifications];
+     unsigned temp, temp2;
+     for (p = 0, j = 0; j < ch_used; ++j) {
+         if (!do_not_decode[j]) {
+             temp = get_vlc2(&vc->gb, vc->codebooks[vr->classbook].vlc.table,
+                                      vc->codebooks[vr->classbook].nb_bits, 3);
+ 
+             av_dlog(NULL, "Classword: %u\n", temp);
+ 
++            av_assert0(vr->classifications > 1 && temp <= 65536); //needed for inverse[]
+ 
+             for (i = 0; i < c_p_c; ++i) {
+                 temp2 = (((uint64_t)temp) * inverse_class) >> 32;
+                 if (partition_count + c_p_c - 1 - i < vr->ptns_to_read)
+                     vr->classifs[p + partition_count + c_p_c - 1 - i] =
+                         temp - temp2 * vr->classifications;
+                 temp = temp2;
+             }
+         }
+         p += vr->ptns_to_read;
+     }
+     return 0;
+ }
  // Read and decode residue
  
  static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc,