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