annotate tremor/tremor.diff @ 29348:1ee2b495f09b

AltiVec code and runtime cpudetect do not require CONFIG_GPL. Make sure the latter is only checked for x86 optimizations, which are GPL.
author diego
date Thu, 25 Jun 2009 20:06:03 +0000
parents e83eef58b30a
children f01023c524c3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
14369
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
3 @@ -29,8 +29,9 @@
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
4 /* 64 bit multiply */
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
5
14369
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
6 #include <sys/types.h>
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
7 +#include "config.h"
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
8
14369
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
9 -#if BYTE_ORDER==LITTLE_ENDIAN
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
10 +#ifndef WORDS_BIGENDIAN
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
11 union magic {
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
12 struct {
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
13 ogg_int32_t lo;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
14 @@ -38,9 +39,7 @@
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
15 } halves;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
16 ogg_int64_t whole;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
17 };
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
18 -#endif
14369
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
19 -
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
20 -#if BYTE_ORDER==BIG_ENDIAN
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
21 +#else
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
22 union magic {
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
23 struct {
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
24 ogg_int32_t hi;
16266
c820ccd4f5eb fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents: 15455
diff changeset
25 --- 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
26 +++ 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
27 @@ -208,7 +211,7 @@
16266
c820ccd4f5eb fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents: 15455
diff changeset
28 int indexdiv=1;
c820ccd4f5eb fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents: 15455
diff changeset
29 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
30 int index= (j/indexdiv)%quantvals;
c820ccd4f5eb fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents: 15455
diff changeset
31 - int point;
c820ccd4f5eb fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents: 15455
diff changeset
32 + ogg_int32_t point;
c820ccd4f5eb fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents: 15455
diff changeset
33 int val=VFLOAT_MULTI(delta,delpoint,
c820ccd4f5eb fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents: 15455
diff changeset
34 abs(b->quantlist[index]),&point);
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
35
19257
fb837e2ab413 Make patch apply cleanly and with -p0, not a mix of -p0 and -p1.
diego
parents: 16266
diff changeset
36 @@ -242,7 +245,7 @@
16266
c820ccd4f5eb fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents: 15455
diff changeset
37 int lastpoint=0;
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
38
16266
c820ccd4f5eb fix warnings and decoding on CYGWIN (produced only noise before this change)
faust3
parents: 15455
diff changeset
39 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
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[j*b->dim+k]),&point);
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
44
24796
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
45 --- block.h (revision 0)
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
46 +++ block.h (revision 0)
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
47 @@ -0,0 +1,24 @@
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
48 +/********************************************************************
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
49 + * *
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
50 + * 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
51 + * *
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
52 + * 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
53 + * 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
54 + * 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
55 + * *
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
56 + * 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
57 + * 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
58 + * *
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
59 + ********************************************************************
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 + function: basic shared block operations
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
62 +
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
63 + ********************************************************************/
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 +#ifndef _V_BLOCK_H_
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
66 +#define _V_BLOCK_H_
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 +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
69 +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
70 +
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
71 +#endif
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
72 --- floor0.c (revision 24821)
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
73 +++ floor0.c (working copy)
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
74 @@ -25,6 +25,7 @@
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
75 #include "codebook.h"
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
76 #include "misc.h"
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
77 #include "os.h"
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
78 +#include "block.h"
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
79
24796
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
80 #define LSP_FRACBITS 14
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
81
24796
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
82 --- floor1.c (revision 24821)
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
83 +++ floor1.c (working copy)
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
84 @@ -24,6 +24,7 @@
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
85 #include "registry.h"
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
86 #include "codebook.h"
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
87 #include "misc.h"
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
88 +#include "block.h"
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
89
24796
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
90 #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
91
24796
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
92 --- synthesis.c (revision 24821)
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
93 +++ synthesis.c (working copy)
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
94 @@ -23,6 +23,7 @@
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
95 #include "registry.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 "os.h"
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
98 +#include "block.h"
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
99
24796
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
100 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
101 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
102 --- res012.c (revision 24821)
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
103 +++ res012.c (working copy)
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
104 @@ -25,6 +25,7 @@
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
105 #include "codebook.h"
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
106 #include "misc.h"
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
107 #include "os.h"
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
108 +#include "block.h"
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
109
24796
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
110 typedef struct {
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
111 vorbis_info_residue0 *info;
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
112 --- block.c (revision 24821)
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
113 +++ block.c (working copy)
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
114 @@ -25,6 +25,7 @@
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
115 #include "window.h"
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
116 #include "registry.h"
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
117 #include "misc.h"
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
118 +#include "block.h"
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
119
24796
8dfda4d651ec _vorbis_block_alloc() is used w/o prototype, this will crash on ia64.
diego
parents: 24795
diff changeset
120 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
121 int ret=0;
25847
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
122 --- os.h (revision 25873)
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
123 +++ os.h (working copy)
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
124 @@ -20,18 +20,8 @@
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
125 #include <math.h>
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
126 #include "os_types.h"
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
127
25847
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
128 -#ifndef _V_IFDEFJAIL_H_
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
129 -# define _V_IFDEFJAIL_H_
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
130 +#define STIN static inline
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
131
25847
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
132 -# ifdef __GNUC__
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
133 -# define STIN static __inline__
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
134 -# elif _WIN32
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
135 -# define STIN static __inline
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
136 -# endif
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
137 -#else
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
138 -# define STIN static
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
139 -#endif
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
140 -
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
141 #ifndef M_PI
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
142 # define M_PI (3.1415926536f)
fe50eaad932d Use the standard "static inline" instead of some broken ifdef mess
reimar
parents: 24796
diff changeset
143 #endif
26867
e61b6352f32f Instead of removing code from this imported library, place it under #if 0.
diego
parents: 25847
diff changeset
144 --- 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
145 +++ 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
146 @@ -32,6 +32,15 @@
e61b6352f32f Instead of removing code from this imported library, place it under #if 0.
diego
parents: 25847
diff changeset
147 #define _ogg_realloc realloc
e61b6352f32f Instead of removing code from this imported library, place it under #if 0.
diego
parents: 25847
diff changeset
148 #define _ogg_free free
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
149
26867
e61b6352f32f Instead of removing code from this imported library, place it under #if 0.
diego
parents: 25847
diff changeset
150 +#include <inttypes.h>
e61b6352f32f Instead of removing code from this imported library, place it under #if 0.
diego
parents: 25847
diff changeset
151 +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
152 +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
153 +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
154 +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
155 +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
156 +
e61b6352f32f Instead of removing code from this imported library, place it under #if 0.
diego
parents: 25847
diff changeset
157 +#if 0
e61b6352f32f Instead of removing code from this imported library, place it under #if 0.
diego
parents: 25847
diff changeset
158 +
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
159 #ifdef _WIN32
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
160
26867
e61b6352f32f Instead of removing code from this imported library, place it under #if 0.
diego
parents: 25847
diff changeset
161 # ifndef __GNUC__
e61b6352f32f Instead of removing code from this imported library, place it under #if 0.
diego
parents: 25847
diff changeset
162 @@ -85,4 +94,6 @@
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
163
26867
e61b6352f32f Instead of removing code from this imported library, place it under #if 0.
diego
parents: 25847
diff changeset
164 #endif
29264
e83eef58b30a Remove all kind of trailing whitespaces from all MPlayer's files.
bircoph
parents: 28798
diff changeset
165
26867
e61b6352f32f Instead of removing code from this imported library, place it under #if 0.
diego
parents: 25847
diff changeset
166 +#endif /* 0 */
e61b6352f32f Instead of removing code from this imported library, place it under #if 0.
diego
parents: 25847
diff changeset
167 +
e61b6352f32f Instead of removing code from this imported library, place it under #if 0.
diego
parents: 25847
diff changeset
168 #endif /* _OS_TYPES_H */
28798
60b7ea3da519 Sync latest set of changes.
diego
parents: 26867
diff changeset
169 --- mapping0.c (revision 28274)
60b7ea3da519 Sync latest set of changes.
diego
parents: 26867
diff changeset
170 +++ mapping0.c (revision 28275)
60b7ea3da519 Sync latest set of changes.
diego
parents: 26867
diff changeset
171 @@ -19,6 +20,7 @@
60b7ea3da519 Sync latest set of changes.
diego
parents: 26867
diff changeset
172 #include <string.h>
60b7ea3da519 Sync latest set of changes.
diego
parents: 26867
diff changeset
173 #include <math.h>
60b7ea3da519 Sync latest set of changes.
diego
parents: 26867
diff changeset
174 #include "ogg.h"
60b7ea3da519 Sync latest set of changes.
diego
parents: 26867
diff changeset
175 +#include "os.h"
60b7ea3da519 Sync latest set of changes.
diego
parents: 26867
diff changeset
176 #include "ivorbiscodec.h"
60b7ea3da519 Sync latest set of changes.
diego
parents: 26867
diff changeset
177 #include "mdct.h"
60b7ea3da519 Sync latest set of changes.
diego
parents: 26867
diff changeset
178 #include "codec_internal.h"