Sync codeclib bitstream code with upstream ffmpeg code. Build ffmpeg_bitstream.c as a part of the codec lib. Use this codeclib implementation in libffmpegFLAC. Implement adapted version of the unaligned longword reading optimization for coldfire from the libwma version of this code. Speeds up cook decoding by 2-3% on h300 and flac by 25% on h300, also speeds up flac decoding by 2% on c200 (decoding speed of cook on c200 is unchanged).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27430 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 2 insertions, 2 deletions

diff --git a/apps/codecs/libatrac/SOURCES b/apps/codecs/libatrac/SOURCES
index 5a033c1732..3eaf4c9c3b 100644
--- a/apps/codecs/libatrac/SOURCES
+++ b/apps/codecs/libatrac/SOURCES
@@ -2,4 +2,4 @@ atrac3.c
 #if defined(CPU_ARM)
 atrac3_arm.S
 #endif
-../lib/ffmpeg_bitstream.c
+
diff --git a/apps/codecs/libatrac/atrac3.h b/apps/codecs/libatrac/atrac3.h
index d3fdc5056a..74dd992e1b 100644
--- a/apps/codecs/libatrac/atrac3.h
+++ b/apps/codecs/libatrac/atrac3.h
@@ -19,7 +19,7 @@
  *
  ****************************************************************************/
 
-#include "ffmpeg_bitstream.h"
+#include "ffmpeg_get_bits.h"
 #include "../librm/rm.h"
 #include "codeclib.h"