diff options
author | Dave Chapman <dave@dchapman.com> | 2009-05-09 01:21:49 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2009-05-09 01:21:49 +0000 |
commit | 67695617a13e9f37f17e3718b03046f6d748a9e1 (patch) | |
tree | 7e8a8b5fb8d4222e3286f3300bcf12ad439424b0 /apps/codecs/libcook/libavutil/internal.h | |
parent | 69db01e72f2de91d35703919bfc9d0700df83e85 (diff) | |
download | rockbox-67695617a13e9f37f17e3718b03046f6d748a9e1.tar.gz rockbox-67695617a13e9f37f17e3718b03046f6d748a9e1.zip |
The first part of Mohamed Tarek's Google Summer of Code work to implement RealAudio support in Rockbox. This is a self-contained Cook decoder using the original ffmpeg (still floating point) decoder and a new RM parser started by me in 2008 and continued by MT over the past few months. This is the equivalent of libcook.patch1 from FS#10182, but with further cleaning by both MT and me to minimise the differences to the original ffmpeg files. See README.rockbox for more details.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20883 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libcook/libavutil/internal.h')
-rw-r--r-- | apps/codecs/libcook/libavutil/internal.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/codecs/libcook/libavutil/internal.h b/apps/codecs/libcook/libavutil/internal.h index 4191aa8e52..f8f9418a76 100644 --- a/apps/codecs/libcook/libavutil/internal.h +++ b/apps/codecs/libcook/libavutil/internal.h | |||
@@ -34,10 +34,10 @@ | |||
34 | #include <stdint.h> | 34 | #include <stdint.h> |
35 | #include <stddef.h> | 35 | #include <stddef.h> |
36 | #include <assert.h> | 36 | #include <assert.h> |
37 | #include "config.h" | 37 | //#include "ffmpeg_config.h" |
38 | #include "common.h" | 38 | #include "common.h" |
39 | #include "mem.h" | 39 | #include "mem.h" |
40 | #include "timer.h" | 40 | //#include "timer.h" |
41 | 41 | ||
42 | #ifndef attribute_align_arg | 42 | #ifndef attribute_align_arg |
43 | #if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,2) | 43 | #if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,2) |
@@ -223,10 +223,10 @@ if((y)<(x)){\ | |||
223 | #define realloc please_use_av_realloc | 223 | #define realloc please_use_av_realloc |
224 | #undef time | 224 | #undef time |
225 | #define time time_is_forbidden_due_to_security_issues | 225 | #define time time_is_forbidden_due_to_security_issues |
226 | #undef rand | 226 | //#undef rand |
227 | #define rand rand_is_forbidden_due_to_state_trashing_use_av_random | 227 | //#define rand rand_is_forbidden_due_to_state_trashing_use_av_random |
228 | #undef srand | 228 | //#undef srand |
229 | #define srand srand_is_forbidden_due_to_state_trashing_use_av_random_init | 229 | //#define srand srand_is_forbidden_due_to_state_trashing_use_av_random_init |
230 | #undef random | 230 | #undef random |
231 | #define random random_is_forbidden_due_to_state_trashing_use_av_random | 231 | #define random random_is_forbidden_due_to_state_trashing_use_av_random |
232 | #undef sprintf | 232 | #undef sprintf |