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);