diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-07 01:04:41 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-07 01:04:41 +0200 |
commit | e0172b96e3b6cc6a8b62ee5a52f780941a43de8b (patch) | |
tree | f652f6d15740667d5434e526db3fd12a0573aa0f /tremor/tremor.diff | |
parent | 0c6f667896620943ee6ae899d6e36c3da5c98c54 (diff) | |
parent | 7e253f01715811e0c4f5f5b54317b098f2cd59d9 (diff) | |
download | mpv-e0172b96e3b6cc6a8b62ee5a52f780941a43de8b.tar.bz2 mpv-e0172b96e3b6cc6a8b62ee5a52f780941a43de8b.tar.xz |
Merge svn changes up to r28862
Diffstat (limited to 'tremor/tremor.diff')
-rw-r--r-- | tremor/tremor.diff | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tremor/tremor.diff b/tremor/tremor.diff index 393889a450..2838721e69 100644 --- a/tremor/tremor.diff +++ b/tremor/tremor.diff @@ -166,3 +166,13 @@ +#endif /* 0 */ + #endif /* _OS_TYPES_H */ +--- mapping0.c (revision 28274) ++++ mapping0.c (revision 28275) +@@ -19,6 +20,7 @@ + #include <string.h> + #include <math.h> + #include "ogg.h" ++#include "os.h" + #include "ivorbiscodec.h" + #include "mdct.h" + #include "codec_internal.h" |