summaryrefslogtreecommitdiff
path: root/apps/codecs
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2010-12-06 16:44:40 +0000
committerNils Wallménius <nils@rockbox.org>2010-12-06 16:44:40 +0000
commit0d43bf6a88f6634ed7a132d5ac227a007649f57b (patch)
tree2146f1fde933ab36beaa56065050141ada18ce10 /apps/codecs
parent8a239cf4f78a34e9429f72921ca7e960b5e169c5 (diff)
downloadrockbox-0d43bf6a88f6634ed7a132d5ac227a007649f57b.tar.gz
rockbox-0d43bf6a88f6634ed7a132d5ac227a007649f57b.zip
libtremor: merge upstream revision 17512 'Correctly handle the nonsensical codebook.dim==0 case.'
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28746 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs')
-rw-r--r--apps/codecs/libtremor/codebook.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/codecs/libtremor/codebook.c b/apps/codecs/libtremor/codebook.c
index c07b99bce4..f86b762f3c 100644
--- a/apps/codecs/libtremor/codebook.c
+++ b/apps/codecs/libtremor/codebook.c
@@ -106,7 +106,7 @@ int vorbis_staticbook_unpack(oggpack_buffer *opb,static_codebook *s){
106 int quantvals=0; 106 int quantvals=0;
107 switch(s->maptype){ 107 switch(s->maptype){
108 case 1: 108 case 1:
109 quantvals=_book_maptype1_quantvals(s); 109 quantvals=(s->dim==0?0:_book_maptype1_quantvals(s));
110 break; 110 break;
111 case 2: 111 case 2:
112 quantvals=s->entries*s->dim; 112 quantvals=s->entries*s->dim;