diff options
| -rw-r--r-- | libavcodec/vorbisdec.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 661943f8b3..c4063eb3bc 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1330,14 +1330,24 @@ static av_always_inline int setup_classifs(vorbis_context *vc, av_dlog(NULL, "Classword: %u\n", temp); - av_assert0(vr->classifications > 1 && temp <= 65536); //needed for inverse[] + av_assert0(vr->classifications > 1); //needed for inverse[] - for (i = partition_count + c_p_c - 1; i >= partition_count; i--) { - temp2 = (((uint64_t)temp) * inverse_class) >> 32; + if (temp <= 65536) { + for (i = partition_count + c_p_c - 1; i >= partition_count; i--) { + temp2 = (((uint64_t)temp) * inverse_class) >> 32; - if (i < vr->ptns_to_read) - vr->classifs[p + i] = temp - temp2 * vr->classifications; - temp = temp2; + if (i < vr->ptns_to_read) + vr->classifs[p + i] = temp - temp2 * vr->classifications; + temp = temp2; + } + } else { + for (i = partition_count + c_p_c - 1; i >= partition_count; i--) { + temp2 = temp / vr->classifications; + + if (i < vr->ptns_to_read) + vr->classifs[p + i] = temp - temp2 * vr->classifications; + temp = temp2; + } } } p += vr->ptns_to_read; |