annotate libfaad2/local_changes.diff @ 14835:056446159745

Yet another fourcc for mpeg-4 (files should be made with Xvid)
author rtognimp
date Sun, 27 Feb 2005 01:03:41 +0000
parents ca694d6b5375
children cc0c5443548d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14712
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
1 --- libfaad/bits.h 2004-03-11 14:32:39.000000000 +0100
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
2 +++ libfaad2/bits.h 2004-06-24 10:47:02.000000000 +0200
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
3 @@ -58,7 +60,7 @@
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
4
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
5 #if defined (_WIN32) && !defined(_WIN32_WCE) && !defined(__MINGW32__)
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
6 #define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
7 -#elif defined(LINUX) || defined(DJGPP) || defined(__MINGW32__)
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
8 +#elif defined(LINUX) || defined(DJGPP)
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
9 #define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) )
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
10 #else
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
11 #define BSWAP(a) \
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
12 diff -u libfaad/common.h /usr/src/mplayer/main/libfaad2/common.h
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
13 --- libfaad/common.h 2004-06-30 14:45:56.000000000 +0200
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
14 +++ libfaad2/common.h 2004-10-19 03:16:03.000000000 +0200
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
15 @@ -32,10 +34,13 @@
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
16 extern "C" {
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
17 #endif
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
18
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
19 -#ifdef HAVE_CONFIG_H
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
20 -# include "../config.h"
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
21 +/* Allow build on Cygwin*/
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
22 +#if defined(__CYGWIN__)
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
23 +#define __STRICT_ANSI__
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
24 #endif
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
25
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
26 +#include "../config.h"
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
27 +
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
28 #define INLINE __inline
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
29 #if 0 //defined(_WIN32) && !defined(_WIN32_WCE)
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
30 #define ALIGN __declspec(align(16))
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
31 @@ -117,6 +122,9 @@
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
32 # ifdef MAIN_DEC
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
33 # undef MAIN_DEC
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
34 # endif
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
35 +# ifdef SBR_DEC
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
36 +# undef SBR_DEC
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
37 +# endif
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
38 #endif // FIXED_POINT
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
39
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
40 #ifdef DRM
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
41 @@ -157,6 +165,7 @@
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
42
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
43 #include <stdlib.h>
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
44
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
45 +#if 0
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
46 typedef unsigned __int64 uint64_t;
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
47 typedef unsigned __int32 uint32_t;
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
48 typedef unsigned __int16 uint16_t;
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
49 @@ -165,11 +174,31 @@
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
50 typedef __int32 int32_t;
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
51 typedef __int16 int16_t;
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
52 typedef __int8 int8_t;
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
53 +#else
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
54 +#include <inttypes.h>
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
55 +#endif
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
56 +
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
57 typedef float float32_t;
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
58
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
59
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
60 #else
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
61
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
62 +/* #undef HAVE_FLOAT32_T */
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
63 +/* Define if you have the <inttypes.h> header file. */
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
64 +#define HAVE_INTTYPES_H 1
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
65 +
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
66 +/* Define if you have the `memcpy' function. */
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
67 +#define HAVE_MEMCPY 1
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
68 +
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
69 +/* Define if you have the <stdint.h> header file. */
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
70 +#define HAVE_STDINT_H 1
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
71 +
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
72 +/* Define if you have the `strchr' function. */
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
73 +#define HAVE_STRCHR 1
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
74 +
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
75 +/* Define if you have the ANSI C header files. */
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
76 +#define STDC_HEADERS 1
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
77 +
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
78 #include <stdio.h>
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
79 #if HAVE_SYS_TYPES_H
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
80 # include <sys/types.h>
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
81 @@ -311,7 +340,7 @@
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
82 }
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
83 return i;
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
84 }
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
85 - #elif (defined(__i386__) && defined(__GNUC__))
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
86 + #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__MINGW32__)
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
87 #define HAS_LRINTF
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
88 // from http://www.stereopsis.com/FPU.html
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
89 static INLINE int lrintf(float f)
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
90 @@ -340,6 +369,8 @@
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
91
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
92 #else
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
93
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
94 +#include <math.h>
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
95 +
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
96 #ifdef HAVE_LRINTF
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
97 # define HAS_LRINTF
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
98 # define _ISOC9X_SOURCE 1
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
99 @@ -348,8 +379,6 @@
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
100 # define __USE_ISOC99 1
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
101 #endif
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
102
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
103 - #include <math.h>
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
104 -
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
105 #ifdef HAVE_SINF
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
106 # define sin sinf
ca694d6b5375 MPlayer-specific changes to libfaad
diego
parents:
diff changeset
107 #error