diff options
| author | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-05 09:50:05 +0000 |
|---|---|---|
| committer | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-05 09:50:05 +0000 |
| commit | 608f639faa550223685e372453ba71462c8e3a68 (patch) | |
| tree | c3d9f459bd633273b8e6dea363c634fce4279160 /tremor | |
| parent | 6f1bd3e31d7d914f694aac14165b2b36b4e37dd1 (diff) | |
| download | mpv-608f639faa550223685e372453ba71462c8e3a68.tar.bz2 mpv-608f639faa550223685e372453ba71462c8e3a68.tar.xz | |
changes against 1.0 + Dec 2004 SVN math code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14370 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'tremor')
| -rw-r--r-- | tremor/tremor.diff | 90 |
1 files changed, 90 insertions, 0 deletions
diff --git a/tremor/tremor.diff b/tremor/tremor.diff new file mode 100644 index 0000000000..1e174b1457 --- /dev/null +++ b/tremor/tremor.diff @@ -0,0 +1,90 @@ +diff -ur orig/misc.h mod-2004-01-05/misc.h +--- orig/misc.h 2005-01-04 16:29:01.000000000 +0100 ++++ mod-2004-01-05/misc.h 2004-12-30 13:09:20.000000000 +0100 +@@ -29,8 +29,9 @@ + /* 64 bit multiply */ + + #include <sys/types.h> ++#include "config.h" + +-#if BYTE_ORDER==LITTLE_ENDIAN ++#ifndef WORDS_BIGENDIAN + union magic { + struct { + ogg_int32_t lo; +@@ -38,9 +39,7 @@ + } halves; + ogg_int64_t whole; + }; +-#endif +- +-#if BYTE_ORDER==BIG_ENDIAN ++#else + union magic { + struct { + ogg_int32_t hi; +diff -ur orig/os_types.h mod-2004-01-05/os_types.h +--- orig/os_types.h 2005-01-04 16:29:02.000000000 +0100 ++++ mod-2004-01-05/os_types.h 2005-01-05 10:39:07.000000000 +0100 +@@ -32,57 +32,10 @@ + #define _ogg_realloc realloc + #define _ogg_free free + +-#ifdef _WIN32 +- +-# ifndef __GNUC__ +- /* MSVC/Borland */ +- typedef __int64 ogg_int64_t; +- typedef __int32 ogg_int32_t; +- typedef unsigned __int32 ogg_uint32_t; +- typedef __int16 ogg_int16_t; +-# else +- /* Cygwin */ +- #include <_G_config.h> +- typedef _G_int64_t ogg_int64_t; +- typedef _G_int32_t ogg_int32_t; +- typedef _G_uint32_t ogg_uint32_t; +- typedef _G_int16_t ogg_int16_t; +-# endif +- +-#elif defined(__MACOS__) +- +-# include <sys/types.h> +- typedef SInt16 ogg_int16_t; +- typedef SInt32 ogg_int32_t; +- typedef UInt32 ogg_uint32_t; +- typedef SInt64 ogg_int64_t; +- +-#elif defined(__MACOSX__) /* MacOS X Framework build */ +- +-# include <sys/types.h> +- typedef int16_t ogg_int16_t; +- typedef int32_t ogg_int32_t; +- typedef u_int32_t ogg_uint32_t; ++ #include <inttypes.h> + typedef int64_t ogg_int64_t; +- +-#elif defined(__BEOS__) +- +- /* Be */ +-# include <inttypes.h> +- +-#elif defined (__EMX__) +- +- /* OS/2 GCC */ +- typedef short ogg_int16_t; +- typedef int ogg_int32_t; +- typedef unsigned int ogg_uint32_t; +- typedef long long ogg_int64_t; +- +-#else +- +-# include <sys/types.h> +-# include "config_types.h" +- +-#endif ++ typedef int32_t ogg_int32_t; ++ typedef uint32_t ogg_uint32_t; ++ typedef int16_t ogg_int16_t; + + #endif /* _OS_TYPES_H */ |