From 49ba646d579a89d5ff0e4f3d5eea237eea22aafd Mon Sep 17 00:00:00 2001 From: Mohamed Tarek Date: Tue, 12 May 2009 20:50:35 +0000 Subject: -Remove all dynamic allocations, hence remove cook_decode_close() which was basically needed for freeing allocated memory. -Remove any ffmpeg-specific attributes (av_const,av_always_inline .. etc.). -Move some math functions to cook_fixpoint.h - libavutil/common.h is no longer needed. -Remove libavutil/mem.[c/h], libavutil/common.h and libavutil/internal.h. -Fix a warning in cookdata_fixpoint.h. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20922 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/libcook/bitstream.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'apps/codecs/libcook/bitstream.h') diff --git a/apps/codecs/libcook/bitstream.h b/apps/codecs/libcook/bitstream.h index 2319a4d..caef254 100644 --- a/apps/codecs/libcook/bitstream.h +++ b/apps/codecs/libcook/bitstream.h @@ -29,10 +29,9 @@ #include #include #include +#include +#include #include "libavutil/bswap.h" -#include "libavutil/common.h" -//#include "libavutil/log.h" -//#include "mathops.h" /* The following 2 defines are taken from libavutil/intreadwrite.h */ #define AV_RB32(x) ((((const uint8_t*)(x))[0] << 24) | \ @@ -881,7 +880,7 @@ void free_vlc(VLC *vlc); * read the longest vlc code * = (max_vlc_length + bits - 1) / bits */ -static av_always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2], +static inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2], int bits, int max_depth) { int code; -- cgit v1.1