summaryrefslogtreecommitdiffstats
path: root/tremor
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-05-14 10:05:09 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-05-14 10:05:09 +0000
commitcc3510ef06ddb3543806c5c0768e12dfb9271c13 (patch)
tree31b559bdd71b5680faddf7b78986a451487822a2 /tremor
parent22b533f0280d5d33c4f698fd9ce6d1aa925c7f6f (diff)
downloadmpv-cc3510ef06ddb3543806c5c0768e12dfb9271c13.tar.bz2
mpv-cc3510ef06ddb3543806c5c0768e12dfb9271c13.tar.xz
Update with Jindrich's latest change.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15456 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'tremor')
-rw-r--r--tremor/tremor.diff3
1 files changed, 2 insertions, 1 deletions
diff --git a/tremor/tremor.diff b/tremor/tremor.diff
index 1e174b1457..818e902609 100644
--- a/tremor/tremor.diff
+++ b/tremor/tremor.diff
@@ -26,7 +26,7 @@ diff -ur orig/misc.h mod-2004-01-05/misc.h
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 @@
+@@ -32,57 +32,11 @@
#define _ogg_realloc realloc
#define _ogg_free free
@@ -85,6 +85,7 @@ diff -ur orig/os_types.h mod-2004-01-05/os_types.h
-#endif
+ typedef int32_t ogg_int32_t;
+ typedef uint32_t ogg_uint32_t;
++ typedef uint16_t ogg_uint16_t;
+ typedef int16_t ogg_int16_t;
#endif /* _OS_TYPES_H */