Merge commit 'db347280eb3746d7b70888db97f1efe5f06f5624'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 May 2013 10:02:18 +0000 (12:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 May 2013 10:02:18 +0000 (12:02 +0200)
* commit 'db347280eb3746d7b70888db97f1efe5f06f5624':
  vorbis: fallback to normal division instead of crashing

Conflicts:
libavcodec/vorbisdec.c

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

index 661943f..c4063eb 100644 (file)
@@ -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;