Mercurial > mplayer.hg

comparison libfaad2/local_changes.diff @ 14858:cc0c5443548d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetics: Make diff -R apply without offsets.
author diego
date Tue, 01 Mar 2005 05:49:56 +0000
parents ca694d6b5375
children d47cd711f617
comparison
equal deleted inserted replaced
14857:29a09f111b41 14858:cc0c5443548d
1 --- libfaad/bits.h 2004-03-11 14:32:39.000000000 +0100 1 --- libfaad/bits.h 2004-03-11 14:32:39.000000000 +0100
2 +++ libfaad2/bits.h 2004-06-24 10:47:02.000000000 +0200 2 +++ libfaad2/bits.h 2004-06-24 10:47:02.000000000 +0200
3 @@ -58,7 +60,7 @@ 3 @@ -58,7 +61,7 @@
4 4
5 #if defined (_WIN32) && !defined(_WIN32_WCE) && !defined(__MINGW32__) 5 #if defined (_WIN32) && !defined(_WIN32_WCE) && !defined(__MINGW32__)
6 #define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax 6 #define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax
7 -#elif defined(LINUX) || defined(DJGPP) || defined(__MINGW32__) 7 -#elif defined(LINUX) || defined(DJGPP) || defined(__MINGW32__)
8 +#elif defined(LINUX) || defined(DJGPP) 8 +#elif defined(LINUX) || defined(DJGPP)
9 #define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) ) 9 #define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) )
10 #else 10 #else
11 #define BSWAP(a) \ 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 12 --- libfaad/common.h 2004-06-30 14:45:56.000000000 +0200
14 +++ libfaad2/common.h 2004-10-19 03:16:03.000000000 +0200 13 +++ libfaad2/common.h 2004-10-19 03:16:03.000000000 +0200
15 @@ -32,10 +34,13 @@ 14 @@ -32,10 +35,13 @@
16 extern "C" { 15 extern "C" {
17 #endif 16 #endif
18 17
19 -#ifdef HAVE_CONFIG_H 18 -#ifdef HAVE_CONFIG_H
20 -# include "../config.h" 19 -# include "../config.h"
26 +#include "../config.h" 25 +#include "../config.h"
27 + 26 +
28 #define INLINE __inline 27 #define INLINE __inline
29 #if 0 //defined(_WIN32) && !defined(_WIN32_WCE) 28 #if 0 //defined(_WIN32) && !defined(_WIN32_WCE)
30 #define ALIGN __declspec(align(16)) 29 #define ALIGN __declspec(align(16))
31 @@ -117,6 +122,9 @@ 30 @@ -117,6 +123,9 @@
32 # ifdef MAIN_DEC 31 # ifdef MAIN_DEC
33 # undef MAIN_DEC 32 # undef MAIN_DEC
34 # endif 33 # endif
35 +# ifdef SBR_DEC 34 +# ifdef SBR_DEC
36 +# undef SBR_DEC 35 +# undef SBR_DEC
37 +# endif 36 +# endif
38 #endif // FIXED_POINT 37 #endif // FIXED_POINT
39 38
40 #ifdef DRM 39 #ifdef DRM
41 @@ -157,6 +165,7 @@ 40 @@ -157,6 +166,7 @@
42 41
43 #include <stdlib.h> 42 #include <stdlib.h>
44 43
45 +#if 0 44 +#if 0
46 typedef unsigned __int64 uint64_t; 45 typedef unsigned __int64 uint64_t;
47 typedef unsigned __int32 uint32_t; 46 typedef unsigned __int32 uint32_t;
48 typedef unsigned __int16 uint16_t; 47 typedef unsigned __int16 uint16_t;
49 @@ -165,11 +174,31 @@ 48 @@ -165,11 +175,31 @@
50 typedef __int32 int32_t; 49 typedef __int32 int32_t;
51 typedef __int16 int16_t; 50 typedef __int16 int16_t;
52 typedef __int8 int8_t; 51 typedef __int8 int8_t;
53 +#else 52 +#else
54 +#include <inttypes.h> 53 +#include <inttypes.h>
76 +#define STDC_HEADERS 1 75 +#define STDC_HEADERS 1
77 + 76 +
78 #include <stdio.h> 77 #include <stdio.h>
79 #if HAVE_SYS_TYPES_H 78 #if HAVE_SYS_TYPES_H
80 # include <sys/types.h> 79 # include <sys/types.h>
81 @@ -311,7 +340,7 @@ 80 @@ -311,7 +341,7 @@
82 } 81 }
83 return i; 82 return i;
84 } 83 }
85 - #elif (defined(__i386__) && defined(__GNUC__)) 84 - #elif (defined(__i386__) && defined(__GNUC__))
86 + #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__MINGW32__) 85 + #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__MINGW32__)
87 #define HAS_LRINTF 86 #define HAS_LRINTF
88 // from http://www.stereopsis.com/FPU.html 87 // from http://www.stereopsis.com/FPU.html
89 static INLINE int lrintf(float f) 88 static INLINE int lrintf(float f)
90 @@ -340,6 +369,8 @@ 89 @@ -340,6 +370,8 @@
91 90
92 #else 91 #else
93 92
94 +#include <math.h> 93 +#include <math.h>
95 + 94 +
96 #ifdef HAVE_LRINTF 95 #ifdef HAVE_LRINTF
97 # define HAS_LRINTF 96 # define HAS_LRINTF
98 # define _ISOC9X_SOURCE 1 97 # define _ISOC9X_SOURCE 1
99 @@ -348,8 +379,6 @@ 98 @@ -348,8 +380,6 @@
100 # define __USE_ISOC99 1 99 # define __USE_ISOC99 1
101 #endif 100 #endif
102 101
103 - #include <math.h> 102 - #include <math.h>
104 - 103 -