diff options
author | Magnus Holmgren <magnushol@gmail.com> | 2006-09-05 16:33:30 +0000 |
---|---|---|
committer | Magnus Holmgren <magnushol@gmail.com> | 2006-09-05 16:33:30 +0000 |
commit | 9eba0d7173cc8f169331966e898fe4ae24a82492 (patch) | |
tree | db40b80defbde2f34aaa7db5d96bcc6d47bfda2e /apps/codecs | |
parent | d770cfa65fe5cb68ff7e45e635af3dcffe282cc5 (diff) | |
download | rockbox-9eba0d7173cc8f169331966e898fe4ae24a82492.tar.gz rockbox-9eba0d7173cc8f169331966e898fe4ae24a82492.zip |
A few minor changes to match upstream svn.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10890 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/Tremor/bitwise.c | 4 | ||||
-rw-r--r-- | apps/codecs/Tremor/ogg.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/codecs/Tremor/bitwise.c b/apps/codecs/Tremor/bitwise.c index 743389b008..3e967b9d42 100644 --- a/apps/codecs/Tremor/bitwise.c +++ b/apps/codecs/Tremor/bitwise.c | |||
@@ -52,7 +52,7 @@ void oggpack_readinit(oggpack_buffer *b,ogg_reference *r){ | |||
52 | long oggpack_look_full(oggpack_buffer *b,int bits) ICODE_ATTR; | 52 | long oggpack_look_full(oggpack_buffer *b,int bits) ICODE_ATTR; |
53 | long oggpack_look_full(oggpack_buffer *b,int bits){ | 53 | long oggpack_look_full(oggpack_buffer *b,int bits){ |
54 | unsigned long m=oggpack_mask[bits]; | 54 | unsigned long m=oggpack_mask[bits]; |
55 | unsigned long ret=0; | 55 | unsigned long ret=-1; |
56 | 56 | ||
57 | bits+=b->headbit; | 57 | bits+=b->headbit; |
58 | 58 | ||
@@ -139,7 +139,7 @@ int oggpack_eop(oggpack_buffer *b){ | |||
139 | long oggpack_read(oggpack_buffer *b,int bits) ICODE_ATTR; | 139 | long oggpack_read(oggpack_buffer *b,int bits) ICODE_ATTR; |
140 | long oggpack_read(oggpack_buffer *b,int bits){ | 140 | long oggpack_read(oggpack_buffer *b,int bits){ |
141 | unsigned long m=oggpack_mask[bits]; | 141 | unsigned long m=oggpack_mask[bits]; |
142 | ogg_uint32_t ret=0; | 142 | ogg_uint32_t ret=-1; |
143 | 143 | ||
144 | bits+=b->headbit; | 144 | bits+=b->headbit; |
145 | 145 | ||
diff --git a/apps/codecs/Tremor/ogg.h b/apps/codecs/Tremor/ogg.h index e6c78da95e..5f85eb420f 100644 --- a/apps/codecs/Tremor/ogg.h +++ b/apps/codecs/Tremor/ogg.h | |||
@@ -191,7 +191,7 @@ static inline long oggpack_look(oggpack_buffer *b, int bits){ | |||
191 | if(bits+b->headbit < b->headend<<3){ | 191 | if(bits+b->headbit < b->headend<<3){ |
192 | extern const unsigned long oggpack_mask[]; | 192 | extern const unsigned long oggpack_mask[]; |
193 | unsigned long m=oggpack_mask[bits]; | 193 | unsigned long m=oggpack_mask[bits]; |
194 | unsigned long ret=0; | 194 | unsigned long ret=-1; |
195 | 195 | ||
196 | bits+=b->headbit; | 196 | bits+=b->headbit; |
197 | ret=b->headptr[0]>>b->headbit; | 197 | ret=b->headptr[0]>>b->headbit; |