diff options
| author | Nils Wallménius <nils@rockbox.org> | 2010-12-12 17:59:05 +0000 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2010-12-12 17:59:05 +0000 |
| commit | a47c04f0c8bddb2e4c6e661b9ca47f31c2b4a833 (patch) | |
| tree | 2a8f658da323e825231101f05e7c81c260f88aec /apps/codecs/libtremor/codebook.c | |
| parent | b655f5840659c382aa4a1ee8bc3aa9282d959a5f (diff) | |
| download | rockbox-a47c04f0c8bddb2e4c6e661b9ca47f31c2b4a833.zip rockbox-a47c04f0c8bddb2e4c6e661b9ca47f31c2b4a833.tar.gz rockbox-a47c04f0c8bddb2e4c6e661b9ca47f31c2b4a833.tar.bz2 rockbox-a47c04f0c8bddb2e4c6e661b9ca47f31c2b4a833.tar.xz | |
Revert tab police as it makes merging upstream changes more annoying and messed up indentation in some places.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28818 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libtremor/codebook.c')
| -rw-r--r-- | apps/codecs/libtremor/codebook.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/apps/codecs/libtremor/codebook.c b/apps/codecs/libtremor/codebook.c index 2bc4b63..9413257 100644 --- a/apps/codecs/libtremor/codebook.c +++ b/apps/codecs/libtremor/codebook.c @@ -82,15 +82,15 @@ static_codebook *vorbis_staticbook_unpack(oggpack_buffer *opb){ s->lengthlist=(long *)_ogg_malloc(sizeof(*s->lengthlist)*s->entries); for(i=0;i<s->entries;){ - long num=oggpack_read(opb,_ilog(s->entries-i)); - if(num==-1)goto _eofout; - if(length>32 || num>s->entries-i || - (num>0 && (num-1)>>(length>>1)>>((length+1)>>1))>0){ - goto _errout; - } - for(j=0;j<num;j++,i++) - s->lengthlist[i]=length; - length++; + long num=oggpack_read(opb,_ilog(s->entries-i)); + if(num==-1)goto _eofout; + if(length>32 || num>s->entries-i || + (num>0 && (num-1)>>(length>>1)>>((length+1)>>1))>0){ + goto _errout; + } + for(j=0;j<num;j++,i++) + s->lengthlist[i]=length; + length++; } } break; @@ -459,7 +459,7 @@ long vorbis_book_decodev_set(codebook *book,ogg_int32_t *a, entry = decode_packed_entry_number(book,b); if(entry==-1)return(-1); t = book->valuelist+entry*book->dim; - for (j=0;i<n && j<book->dim;){ + for (j=0;i<n && j<book->dim;){ a[i++]=t[j++]>>shift; } } @@ -469,7 +469,7 @@ long vorbis_book_decodev_set(codebook *book,ogg_int32_t *a, entry = decode_packed_entry_number(book,b); if(entry==-1)return(-1); t = book->valuelist+entry*book->dim; - for (j=0;i<n && j<book->dim;){ + for (j=0;i<n && j<book->dim;){ a[i++]=t[j++]<<shift; } } |