From 29b2a049de5c6a81c99ef3a2fb9b0e5fce57b86d Mon Sep 17 00:00:00 2001
From: Rafaël Carré <rafael.carre@gmail.com>
Date: Tue, 3 Aug 2010 17:59:59 +0000
Subject: faad: move inline function in header

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27683 a1c6a512-1295-4272-9138-f99709370657
---
 apps/codecs/libfaad/bits.c | 21 ---------------------
 apps/codecs/libfaad/bits.h | 22 +++++++++++++++++++++-
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/apps/codecs/libfaad/bits.c b/apps/codecs/libfaad/bits.c
index 8c70a86204..781eb4feaa 100644
--- a/apps/codecs/libfaad/bits.c
+++ b/apps/codecs/libfaad/bits.c
@@ -110,27 +110,6 @@ uint8_t faad_byte_align(bitfile *ld)
     return 0;
 }
 
-void faad_flushbits_ex(bitfile *ld, uint32_t bits)
-{
-    uint32_t tmp;
-
-    ld->bufa = ld->bufb;
-    if (ld->no_more_reading == 0)
-    {
-        tmp = getdword(ld->tail);
-        ld->tail++;
-    } else {
-        tmp = 0;
-    }
-    ld->bufb = tmp;
-    ld->bits_left += (32 - bits);
-    ld->bytes_used += 4;
-    if (ld->bytes_used == ld->buffer_size)
-        ld->no_more_reading = 1;
-    if (ld->bytes_used > ld->buffer_size)
-        ld->error = 1;
-}
-
 /* rewind to beginning */
 void faad_rewindbits(bitfile *ld)
 {
diff --git a/apps/codecs/libfaad/bits.h b/apps/codecs/libfaad/bits.h
index 0cdc2e6899..c5540a07d0 100644
--- a/apps/codecs/libfaad/bits.h
+++ b/apps/codecs/libfaad/bits.h
@@ -77,7 +77,6 @@ void faad_initbits_rev(bitfile *ld, void *buffer,
                        uint32_t bits_in_buffer);
 uint8_t faad_byte_align(bitfile *ld);
 uint32_t faad_get_processed_bits(bitfile *ld);
-INLINE void faad_flushbits_ex(bitfile *ld, uint32_t bits);
 void faad_rewindbits(bitfile *ld);
 uint8_t *faad_getbitbuffer(bitfile *ld, uint32_t bits
                        DEBUGDEC);
@@ -95,6 +94,27 @@ static INLINE uint32_t getdword(void *mem)
 #endif
 }
 
+static INLINE void faad_flushbits_ex(bitfile *ld, uint32_t bits)
+{
+    uint32_t tmp;
+
+    ld->bufa = ld->bufb;
+    if (ld->no_more_reading == 0)
+    {
+        tmp = getdword(ld->tail);
+        ld->tail++;
+    } else {
+        tmp = 0;
+    }
+    ld->bufb = tmp;
+    ld->bits_left += (32 - bits);
+    ld->bytes_used += 4;
+    if (ld->bytes_used == ld->buffer_size)
+        ld->no_more_reading = 1;
+    if (ld->bytes_used > ld->buffer_size)
+        ld->error = 1;
+}
+
 static INLINE uint32_t faad_showbits(bitfile *ld, uint32_t bits)
 {
     if (bits <= ld->bits_left)
-- 
cgit v1.2.3