Mercurial > mplayer.hg
annotate tremor/tremor.diff @ 21715:9d96f4df253a
sync with r21655, based on a file conversion of help_mp-zh_CN.h
file provided by Eric Wang, eric7wang gmail com
author | kraymer |
---|---|
date | Fri, 22 Dec 2006 22:56:07 +0000 |
parents | fb837e2ab413 |
children | deb3d1cc2852 |
rev | line source |
---|---|
14369 | 1 diff -ur orig/misc.h mod-2004-01-05/misc.h |
19257
fb837e2ab413
Make patch apply cleanly and with -p0, not a mix of -p0 and -p1.
diego
parents:
16266
diff
changeset
|
2 --- misc.h 2005-01-04 16:29:01.000000000 +0100 |
fb837e2ab413
Make patch apply cleanly and with -p0, not a mix of -p0 and -p1.
diego
parents:
16266
diff
changeset
|
3 +++ misc.h 2004-12-30 13:09:20.000000000 +0100 |
14369 | 4 @@ -29,8 +29,9 @@ |
5 /* 64 bit multiply */ | |
6 | |
7 #include <sys/types.h> | |
8 +#include "config.h" | |
9 | |
10 -#if BYTE_ORDER==LITTLE_ENDIAN | |
11 +#ifndef WORDS_BIGENDIAN | |
12 union magic { | |
13 struct { | |
14 ogg_int32_t lo; | |
15 @@ -38,9 +39,7 @@ | |
16 } halves; | |
17 ogg_int64_t whole; | |
18 }; | |
19 -#endif | |
20 - | |
21 -#if BYTE_ORDER==BIG_ENDIAN | |
22 +#else | |
23 union magic { | |
24 struct { | |
25 ogg_int32_t hi; | |
26 diff -ur orig/os_types.h mod-2004-01-05/os_types.h | |
19257
fb837e2ab413
Make patch apply cleanly and with -p0, not a mix of -p0 and -p1.
diego
parents:
16266
diff
changeset
|
27 --- os_types.h 2005-01-04 16:29:02.000000000 +0100 |
fb837e2ab413
Make patch apply cleanly and with -p0, not a mix of -p0 and -p1.
diego
parents:
16266
diff
changeset
|
28 +++ os_types.h 2005-01-05 10:39:07.000000000 +0100 |
15455 | 29 @@ -32,57 +32,11 @@ |
14369 | 30 #define _ogg_realloc realloc |
31 #define _ogg_free free | |
32 | |
33 -#ifdef _WIN32 | |
34 - | |
35 -# ifndef __GNUC__ | |
36 - /* MSVC/Borland */ | |
37 - typedef __int64 ogg_int64_t; | |
38 - typedef __int32 ogg_int32_t; | |
39 - typedef unsigned __int32 ogg_uint32_t; | |
40 - typedef __int16 ogg_int16_t; | |
41 -# else | |
42 - /* Cygwin */ | |
43 - #include <_G_config.h> | |
44 - typedef _G_int64_t ogg_int64_t; | |
45 - typedef _G_int32_t ogg_int32_t; | |
46 - typedef _G_uint32_t ogg_uint32_t; | |
47 - typedef _G_int16_t ogg_int16_t; | |
48 -# endif | |
49 - | |
50 -#elif defined(__MACOS__) | |
51 - | |
52 -# include <sys/types.h> | |
53 - typedef SInt16 ogg_int16_t; | |
54 - typedef SInt32 ogg_int32_t; | |
55 - typedef UInt32 ogg_uint32_t; | |
56 - typedef SInt64 ogg_int64_t; | |
57 - | |
58 -#elif defined(__MACOSX__) /* MacOS X Framework build */ | |
59 - | |
60 -# include <sys/types.h> | |
61 - typedef int16_t ogg_int16_t; | |
62 - typedef int32_t ogg_int32_t; | |
63 - typedef u_int32_t ogg_uint32_t; | |
64 + #include <inttypes.h> | |
65 typedef int64_t ogg_int64_t; | |
66 - | |
67 -#elif defined(__BEOS__) | |
68 - | |
69 - /* Be */ | |
70 -# include <inttypes.h> | |
71 - | |
72 -#elif defined (__EMX__) | |
73 - | |
74 - /* OS/2 GCC */ | |
75 - typedef short ogg_int16_t; | |
76 - typedef int ogg_int32_t; | |
77 - typedef unsigned int ogg_uint32_t; | |
78 - typedef long long ogg_int64_t; | |
79 - | |
80 -#else | |
81 - | |
82 -# include <sys/types.h> | |
83 -# include "config_types.h" | |
84 - | |
85 -#endif | |
86 + typedef int32_t ogg_int32_t; | |
87 + typedef uint32_t ogg_uint32_t; | |
15455 | 88 + typedef uint16_t ogg_uint16_t; |
14369 | 89 + typedef int16_t ogg_int16_t; |
90 | |
91 #endif /* _OS_TYPES_H */ | |
16266
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
92 Index: sharedbook.c |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
93 =================================================================== |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
94 RCS file: /cvsroot/mplayer/main/tremor/sharedbook.c,v |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
95 retrieving revision 1.1 |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
96 diff -u -r1.1 sharedbook.c |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
97 --- sharedbook.c 30 Dec 2004 12:09:20 -0000 1.1 |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
98 +++ sharedbook.c 18 Aug 2005 16:13:54 -0000 |
19257
fb837e2ab413
Make patch apply cleanly and with -p0, not a mix of -p0 and -p1.
diego
parents:
16266
diff
changeset
|
99 @@ -208,7 +211,7 @@ |
16266
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
100 int indexdiv=1; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
101 for(k=0;k<b->dim;k++){ |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
102 int index= (j/indexdiv)%quantvals; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
103 - int point; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
104 + ogg_int32_t point; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
105 int val=VFLOAT_MULTI(delta,delpoint, |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
106 abs(b->quantlist[index]),&point); |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
107 |
19257
fb837e2ab413
Make patch apply cleanly and with -p0, not a mix of -p0 and -p1.
diego
parents:
16266
diff
changeset
|
108 @@ -242,7 +245,7 @@ |
16266
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
109 int lastpoint=0; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
110 |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
111 for(k=0;k<b->dim;k++){ |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
112 - int point; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
113 + ogg_int32_t point; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
114 int val=VFLOAT_MULTI(delta,delpoint, |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
115 abs(b->quantlist[j*b->dim+k]),&point); |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
116 |