Mercurial > mplayer.hg
annotate tremor/tremor.diff @ 30811:50e0f6942e43
Implement Win32 mutexes.
Implement Win32 mutexes; they used to just be mapped on top of events, which
is not the same thing at all.
The implementation is pretty much the obvious one, similar to the
current critical section implementation and the semaphore implementation;
a single lock count protected by a pthread mutex, and an event lockers can
sleep on to know when the mutex is available.
Also make CreateMutexA and ReleaseMutex available even if QuickTime codecs
support is not configured.
author | sesse |
---|---|
date | Sat, 06 Mar 2010 10:13:37 +0000 |
parents | 997ae534ebfe |
children | 5affa2074131 |
rev | line source |
---|---|
19257
fb837e2ab413
Make patch apply cleanly and with -p0, not a mix of -p0 and -p1.
diego
parents:
16266
diff
changeset
|
1 --- 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
|
2 +++ misc.h 2004-12-30 13:09:20.000000000 +0100 |
29997
997ae534ebfe
Add missing #includes to fix a bunch of 'implicit declaration of..' warnings.
diego
parents:
29401
diff
changeset
|
3 @@ -18,6 +18,7 @@ |
997ae534ebfe
Add missing #includes to fix a bunch of 'implicit declaration of..' warnings.
diego
parents:
29401
diff
changeset
|
4 #ifndef _V_RANDOM_H_ |
997ae534ebfe
Add missing #includes to fix a bunch of 'implicit declaration of..' warnings.
diego
parents:
29401
diff
changeset
|
5 #define _V_RANDOM_H_ |
997ae534ebfe
Add missing #includes to fix a bunch of 'implicit declaration of..' warnings.
diego
parents:
29401
diff
changeset
|
6 #include "ivorbiscodec.h" |
997ae534ebfe
Add missing #includes to fix a bunch of 'implicit declaration of..' warnings.
diego
parents:
29401
diff
changeset
|
7 +#include "codec_internal.h" |
997ae534ebfe
Add missing #includes to fix a bunch of 'implicit declaration of..' warnings.
diego
parents:
29401
diff
changeset
|
8 #include "os_types.h" |
997ae534ebfe
Add missing #includes to fix a bunch of 'implicit declaration of..' warnings.
diego
parents:
29401
diff
changeset
|
9 |
997ae534ebfe
Add missing #includes to fix a bunch of 'implicit declaration of..' warnings.
diego
parents:
29401
diff
changeset
|
10 #include "asm_arm.h" |
997ae534ebfe
Add missing #includes to fix a bunch of 'implicit declaration of..' warnings.
diego
parents:
29401
diff
changeset
|
11 @@ -29,8 +30,10 @@ |
14369 | 12 /* 64 bit multiply */ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
13 |
14369 | 14 #include <sys/types.h> |
29997
997ae534ebfe
Add missing #includes to fix a bunch of 'implicit declaration of..' warnings.
diego
parents:
29401
diff
changeset
|
15 +#include <stdlib.h> |
14369 | 16 +#include "config.h" |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
17 |
14369 | 18 -#if BYTE_ORDER==LITTLE_ENDIAN |
29401
f01023c524c3
Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
diego
parents:
29264
diff
changeset
|
19 +#if !HAVE_BIGENDIAN |
14369 | 20 union magic { |
21 struct { | |
22 ogg_int32_t lo; | |
29997
997ae534ebfe
Add missing #includes to fix a bunch of 'implicit declaration of..' warnings.
diego
parents:
29401
diff
changeset
|
23 @@ -38,9 +41,7 @@ |
14369 | 24 } halves; |
25 ogg_int64_t whole; | |
26 }; | |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
27 -#endif |
14369 | 28 - |
29 -#if BYTE_ORDER==BIG_ENDIAN | |
30 +#else | |
31 union magic { | |
32 struct { | |
33 ogg_int32_t hi; | |
16266
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
34 --- 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
|
35 +++ 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
|
36 @@ -208,7 +211,7 @@ |
16266
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
37 int indexdiv=1; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
38 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
|
39 int index= (j/indexdiv)%quantvals; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
40 - int point; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
41 + ogg_int32_t point; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
42 int val=VFLOAT_MULTI(delta,delpoint, |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
43 abs(b->quantlist[index]),&point); |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
44 |
19257
fb837e2ab413
Make patch apply cleanly and with -p0, not a mix of -p0 and -p1.
diego
parents:
16266
diff
changeset
|
45 @@ -242,7 +245,7 @@ |
16266
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
46 int lastpoint=0; |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
47 |
16266
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
48 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
|
49 - int point; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
50 + ogg_int32_t point; |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
51 int val=VFLOAT_MULTI(delta,delpoint, |
c820ccd4f5eb
fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents:
15455
diff
changeset
|
52 abs(b->quantlist[j*b->dim+k]),&point); |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
53 |
24796
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
54 --- block.h (revision 0) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
55 +++ block.h (revision 0) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
56 @@ -0,0 +1,24 @@ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
57 +/******************************************************************** |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
58 + * * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
59 + * THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
60 + * * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
61 + * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
62 + * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
63 + * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
64 + * * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
65 + * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
66 + * BY THE Xiph.Org FOUNDATION http://www.xiph.org/ * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
67 + * * |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
68 + ******************************************************************** |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
69 + |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
70 + function: basic shared block operations |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
71 + |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
72 + ********************************************************************/ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
73 + |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
74 +#ifndef _V_BLOCK_H_ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
75 +#define _V_BLOCK_H_ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
76 + |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
77 +void *_vorbis_block_alloc(vorbis_block *vb,long bytes); |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
78 +void _vorbis_block_ripcord(vorbis_block *vb); |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
79 + |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
80 +#endif |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
81 --- floor0.c (revision 24821) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
82 +++ floor0.c (working copy) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
83 @@ -25,6 +25,7 @@ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
84 #include "codebook.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
85 #include "misc.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
86 #include "os.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
87 +#include "block.h" |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
88 |
24796
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
89 #define LSP_FRACBITS 14 |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
90 |
24796
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
91 --- floor1.c (revision 24821) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
92 +++ floor1.c (working copy) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
93 @@ -24,6 +24,7 @@ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
94 #include "registry.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
95 #include "codebook.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
96 #include "misc.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
97 +#include "block.h" |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
98 |
24796
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
99 #define floor1_rangedB 140 /* floor 1 fixed at -140dB to 0dB range */ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
100 |
24796
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
101 --- synthesis.c (revision 24821) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
102 +++ synthesis.c (working copy) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
103 @@ -23,6 +23,7 @@ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
104 #include "registry.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
105 #include "misc.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
106 #include "os.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
107 +#include "block.h" |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
108 |
24796
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
109 int vorbis_synthesis(vorbis_block *vb,ogg_packet *op){ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
110 vorbis_dsp_state *vd=vb->vd; |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
111 --- res012.c (revision 24821) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
112 +++ res012.c (working copy) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
113 @@ -25,6 +25,7 @@ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
114 #include "codebook.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
115 #include "misc.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
116 #include "os.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
117 +#include "block.h" |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
118 |
24796
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
119 typedef struct { |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
120 vorbis_info_residue0 *info; |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
121 --- block.c (revision 24821) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
122 +++ block.c (working copy) |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
123 @@ -25,6 +25,7 @@ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
124 #include "window.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
125 #include "registry.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
126 #include "misc.h" |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
127 +#include "block.h" |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
128 |
24796
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
129 static int ilog(unsigned int v){ |
8dfda4d651ec
_vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents:
24795
diff
changeset
|
130 int ret=0; |
25847
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
131 --- os.h (revision 25873) |
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
132 +++ os.h (working copy) |
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
133 @@ -20,18 +20,8 @@ |
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
134 #include <math.h> |
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
135 #include "os_types.h" |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
136 |
25847
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
137 -#ifndef _V_IFDEFJAIL_H_ |
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
138 -# define _V_IFDEFJAIL_H_ |
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
139 +#define STIN static inline |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
140 |
25847
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
141 -# ifdef __GNUC__ |
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
142 -# define STIN static __inline__ |
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
143 -# elif _WIN32 |
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
144 -# define STIN static __inline |
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
145 -# endif |
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
146 -#else |
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
147 -# define STIN static |
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
148 -#endif |
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
149 - |
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
150 #ifndef M_PI |
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
151 # define M_PI (3.1415926536f) |
fe50eaad932d
Use the standard "static inline" instead of some broken ifdef mess
reimar
parents:
24796
diff
changeset
|
152 #endif |
26867
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
153 --- os_types.h 2008-05-27 14:59:21.000000000 +0200 |
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
154 +++ os_types.h 2008-05-27 15:00:50.000000000 +0200 |
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
155 @@ -32,6 +32,15 @@ |
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
156 #define _ogg_realloc realloc |
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
157 #define _ogg_free free |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
158 |
26867
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
159 +#include <inttypes.h> |
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
160 +typedef int64_t ogg_int64_t; |
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
161 +typedef int32_t ogg_int32_t; |
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
162 +typedef int16_t ogg_int16_t; |
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
163 +typedef uint32_t ogg_uint32_t; |
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
164 +typedef uint16_t ogg_uint16_t; |
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
165 + |
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
166 +#if 0 |
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
167 + |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
168 #ifdef _WIN32 |
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
169 |
26867
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
170 # ifndef __GNUC__ |
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
171 @@ -85,4 +94,6 @@ |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
172 |
26867
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
173 #endif |
29264
e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents:
28798
diff
changeset
|
174 |
26867
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
175 +#endif /* 0 */ |
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
176 + |
e61b6352f32f
Instead of removing code from this imported library, place it under #if 0.
diego
parents:
25847
diff
changeset
|
177 #endif /* _OS_TYPES_H */ |
28798 | 178 --- mapping0.c (revision 28274) |
179 +++ mapping0.c (revision 28275) | |
180 @@ -19,6 +20,7 @@ | |
181 #include <string.h> | |
182 #include <math.h> | |
183 #include "ogg.h" | |
184 +#include "os.h" | |
185 #include "ivorbiscodec.h" | |
186 #include "mdct.h" | |
187 #include "codec_internal.h" |