summaryrefslogtreecommitdiffstats
path: root/tremor
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-06 00:47:03 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-06 00:47:03 +0000
commite7cb3e94b6548e3fc7ff80a60887bf562fc424c7 (patch)
tree29e4d384a4198578caa59b6f4b2fa019494489a5 /tremor
parentd2a84bde4fb464151fd2eb781255a50334d523ec (diff)
downloadmpv-e7cb3e94b6548e3fc7ff80a60887bf562fc424c7.tar.bz2
mpv-e7cb3e94b6548e3fc7ff80a60887bf562fc424c7.tar.xz
Sync latest set of changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28833 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'tremor')
-rw-r--r--tremor/tremor.diff10
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"