summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2010-12-06 17:16:45 +0000
committerNils Wallménius <nils@rockbox.org>2010-12-06 17:16:45 +0000
commit2aa76d7a1882d268dc01597df03529dd77488888 (patch)
treeab63eb0b27d083fc966ae5536b2dfcb7227b0fee /apps
parentc28778fb5a01b9b70a66e460bef5de82a36c2b96 (diff)
downloadrockbox-2aa76d7a1882d268dc01597df03529dd77488888.tar.gz
rockbox-2aa76d7a1882d268dc01597df03529dd77488888.tar.bz2
rockbox-2aa76d7a1882d268dc01597df03529dd77488888.zip
libtremor: export a libogg function that is now needed.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28749 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/codecs/libtremor/bitwise.c6
-rw-r--r--apps/codecs/libtremor/ogg.h9
2 files changed, 10 insertions, 5 deletions
diff --git a/apps/codecs/libtremor/bitwise.c b/apps/codecs/libtremor/bitwise.c
index 050fb67c60..2ca3c028a6 100644
--- a/apps/codecs/libtremor/bitwise.c
+++ b/apps/codecs/libtremor/bitwise.c
@@ -503,11 +503,13 @@ long oggpackB_read1(oggpack_buffer *b){
b->endbit=1;
return -1L;
}
-
+#endif
+/* moved to ogg.h for inlining
long oggpack_bytes(oggpack_buffer *b){
return(b->endbyte+(b->endbit+7)/8);
}
-
+*/
+#if 0
long oggpack_bits(oggpack_buffer *b){
return(b->endbyte*8+b->endbit);
}
diff --git a/apps/codecs/libtremor/ogg.h b/apps/codecs/libtremor/ogg.h
index da072184b4..1ed08a5387 100644
--- a/apps/codecs/libtremor/ogg.h
+++ b/apps/codecs/libtremor/ogg.h
@@ -128,7 +128,7 @@ extern void oggpack_writeclear(oggpack_buffer *b); */
extern void oggpack_readinit(oggpack_buffer *b,unsigned char *buf,int bytes);
/* extern void oggpack_write(oggpack_buffer *b,unsigned long value,int bits); */
-//extern long oggpack_look(oggpack_buffer *b,int bits);
+/* extern long oggpack_look(oggpack_buffer *b,int bits); */
static inline long oggpack_look(oggpack_buffer *b,int bits){
unsigned long ret;
unsigned long m;
@@ -162,7 +162,7 @@ static inline long oggpack_look(oggpack_buffer *b,int bits){
extern long oggpack_look1(oggpack_buffer *b);
-//extern void oggpack_adv(oggpack_buffer *b,int bits);
+/* extern void oggpack_adv(oggpack_buffer *b,int bits); */
static inline void oggpack_adv(oggpack_buffer *b,int bits){
bits+=b->endbit;
@@ -182,8 +182,11 @@ static inline void oggpack_adv(oggpack_buffer *b,int bits){
extern void oggpack_adv1(oggpack_buffer *b);
extern long oggpack_read(oggpack_buffer *b,int bits);
extern long oggpack_read1(oggpack_buffer *b);
+/* extern long oggpack_bytes(oggpack_buffer *b); */
+static inline long oggpack_bytes(oggpack_buffer *b){
+ return(b->endbyte+(b->endbit+7)/8);
+}
#if 0
-extern long oggpack_bytes(oggpack_buffer *b);
extern long oggpack_bits(oggpack_buffer *b);
extern unsigned char *oggpack_get_buffer(oggpack_buffer *b);