diff options
| author | Mohamed Tarek <mt@rockbox.org> | 2009-05-12 20:50:35 +0000 |
|---|---|---|
| committer | Mohamed Tarek <mt@rockbox.org> | 2009-05-12 20:50:35 +0000 |
| commit | 49ba646d579a89d5ff0e4f3d5eea237eea22aafd (patch) | |
| tree | 32aa872eb82b16c22f1915543c1512b116513209 /apps/codecs/libcook/bitstream.h | |
| parent | 49fccaf2d925def5cc57fff4a09b98a8fe318cc8 (diff) | |
| download | rockbox-49ba646d579a89d5ff0e4f3d5eea237eea22aafd.zip rockbox-49ba646d579a89d5ff0e4f3d5eea237eea22aafd.tar.gz rockbox-49ba646d579a89d5ff0e4f3d5eea237eea22aafd.tar.bz2 rockbox-49ba646d579a89d5ff0e4f3d5eea237eea22aafd.tar.xz | |
-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
Diffstat (limited to 'apps/codecs/libcook/bitstream.h')
| -rw-r--r-- | apps/codecs/libcook/bitstream.h | 7 |
1 files changed, 3 insertions, 4 deletions
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 <stdint.h> #include <stdlib.h> #include <assert.h> +#include <string.h> +#include <stdio.h> #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; |