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/libavutil/bswap.h | |
parent | 49fccaf2d925def5cc57fff4a09b98a8fe318cc8 (diff) | |
download | rockbox-49ba646d579a89d5ff0e4f3d5eea237eea22aafd.tar.gz rockbox-49ba646d579a89d5ff0e4f3d5eea237eea22aafd.zip |
-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/libavutil/bswap.h')
-rw-r--r-- | apps/codecs/libcook/libavutil/bswap.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/codecs/libcook/libavutil/bswap.h b/apps/codecs/libcook/libavutil/bswap.h index 9175cb24a5..443cd1c3f9 100644 --- a/apps/codecs/libcook/libavutil/bswap.h +++ b/apps/codecs/libcook/libavutil/bswap.h | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | #include <stdint.h> | 29 | #include <stdint.h> |
30 | //#include "ffmpeg_config.h" | 30 | //#include "ffmpeg_config.h" |
31 | #include "common.h" | 31 | //#include "common.h" |
32 | 32 | ||
33 | #if ARCH_ARM | 33 | #if ARCH_ARM |
34 | # include "arm/bswap.h" | 34 | # include "arm/bswap.h" |
@@ -41,7 +41,7 @@ | |||
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | #ifndef bswap_16 | 43 | #ifndef bswap_16 |
44 | static av_always_inline av_const uint16_t bswap_16(uint16_t x) | 44 | static inline uint16_t bswap_16(uint16_t x) |
45 | { | 45 | { |
46 | x= (x>>8) | (x<<8); | 46 | x= (x>>8) | (x<<8); |
47 | return x; | 47 | return x; |
@@ -49,7 +49,7 @@ static av_always_inline av_const uint16_t bswap_16(uint16_t x) | |||
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | #ifndef bswap_32 | 51 | #ifndef bswap_32 |
52 | static av_always_inline av_const uint32_t bswap_32(uint32_t x) | 52 | static inline uint32_t bswap_32(uint32_t x) |
53 | { | 53 | { |
54 | x= ((x<<8)&0xFF00FF00) | ((x>>8)&0x00FF00FF); | 54 | x= ((x<<8)&0xFF00FF00) | ((x>>8)&0x00FF00FF); |
55 | x= (x>>16) | (x<<16); | 55 | x= (x>>16) | (x<<16); |
@@ -58,7 +58,7 @@ static av_always_inline av_const uint32_t bswap_32(uint32_t x) | |||
58 | #endif | 58 | #endif |
59 | 59 | ||
60 | #ifndef bswap_64 | 60 | #ifndef bswap_64 |
61 | static inline uint64_t av_const bswap_64(uint64_t x) | 61 | static inline uint64_t bswap_64(uint64_t x) |
62 | { | 62 | { |
63 | #if 0 | 63 | #if 0 |
64 | x= ((x<< 8)&0xFF00FF00FF00FF00ULL) | ((x>> 8)&0x00FF00FF00FF00FFULL); | 64 | x= ((x<< 8)&0xFF00FF00FF00FF00ULL) | ((x>> 8)&0x00FF00FF00FF00FFULL); |