Mercurial > mplayer.hg

annotate tremor/tremor.diff @ 15752:abe14ad09ad3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sync with 1.1012
author gpoirier
date Sat, 18 Jun 2005 22:32:35 +0000
parents 5fed6f245cc3
children c820ccd4f5eb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14369
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
1 diff -ur orig/misc.h mod-2004-01-05/misc.h
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
2 --- orig/misc.h 2005-01-04 16:29:01.000000000 +0100
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
3 +++ mod-2004-01-05/misc.h 2004-12-30 13:09:20.000000000 +0100
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
4 @@ -29,8 +29,9 @@
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
5 /* 64 bit multiply */
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
6
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
7 #include <sys/types.h>
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
8 +#include "config.h"
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
9
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
10 -#if BYTE_ORDER==LITTLE_ENDIAN
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
11 +#ifndef WORDS_BIGENDIAN
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
12 union magic {
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
13 struct {
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
14 ogg_int32_t lo;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
15 @@ -38,9 +39,7 @@
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
16 } halves;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
17 ogg_int64_t whole;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
18 };
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
19 -#endif
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
20 -
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
21 -#if BYTE_ORDER==BIG_ENDIAN
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
22 +#else
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
23 union magic {
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
24 struct {
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
25 ogg_int32_t hi;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
26 diff -ur orig/os_types.h mod-2004-01-05/os_types.h
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
27 --- orig/os_types.h 2005-01-04 16:29:02.000000000 +0100
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
28 +++ mod-2004-01-05/os_types.h 2005-01-05 10:39:07.000000000 +0100
15455
5fed6f245cc3 Update with Jindrich's latest change.
diego
parents: 14369
diff changeset
29 @@ -32,57 +32,11 @@
14369
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
30 #define _ogg_realloc realloc
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
31 #define _ogg_free free
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
32
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
33 -#ifdef _WIN32
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
34 -
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
35 -# ifndef __GNUC__
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
36 - /* MSVC/Borland */
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
37 - typedef __int64 ogg_int64_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
38 - typedef __int32 ogg_int32_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
39 - typedef unsigned __int32 ogg_uint32_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
40 - typedef __int16 ogg_int16_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
41 -# else
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
42 - /* Cygwin */
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
43 - #include <_G_config.h>
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
44 - typedef _G_int64_t ogg_int64_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
45 - typedef _G_int32_t ogg_int32_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
46 - typedef _G_uint32_t ogg_uint32_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
47 - typedef _G_int16_t ogg_int16_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
48 -# endif
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
49 -
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
50 -#elif defined(__MACOS__)
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
51 -
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
52 -# include <sys/types.h>
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
53 - typedef SInt16 ogg_int16_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
54 - typedef SInt32 ogg_int32_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
55 - typedef UInt32 ogg_uint32_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
56 - typedef SInt64 ogg_int64_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
57 -
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
58 -#elif defined(__MACOSX__) /* MacOS X Framework build */
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
59 -
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
60 -# include <sys/types.h>
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
61 - typedef int16_t ogg_int16_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
62 - typedef int32_t ogg_int32_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
63 - typedef u_int32_t ogg_uint32_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
64 + #include <inttypes.h>
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
65 typedef int64_t ogg_int64_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
66 -
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
67 -#elif defined(__BEOS__)
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
68 -
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
69 - /* Be */
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
70 -# include <inttypes.h>
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
71 -
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
72 -#elif defined (__EMX__)
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
73 -
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
74 - /* OS/2 GCC */
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
75 - typedef short ogg_int16_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
76 - typedef int ogg_int32_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
77 - typedef unsigned int ogg_uint32_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
78 - typedef long long ogg_int64_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
79 -
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
80 -#else
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
81 -
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
82 -# include <sys/types.h>
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
83 -# include "config_types.h"
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
84 -
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
85 -#endif
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
86 + typedef int32_t ogg_int32_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
87 + typedef uint32_t ogg_uint32_t;
15455
5fed6f245cc3 Update with Jindrich's latest change.
diego
parents: 14369
diff changeset
88 + typedef uint16_t ogg_uint16_t;
14369
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
89 + typedef int16_t ogg_int16_t;
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
90
a98495858305 changes against 1.0 + Dec 2004 SVN math code
henry
parents:
diff changeset
91 #endif /* _OS_TYPES_H */