diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-18 18:54:42 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-18 18:54:42 +0200 |
| commit | efcc9ad7120e01a17fc3659cb0229135b1cebb95 (patch) | |
| tree | eb15edb75377eedd5d7397209e8c0d594020663e /tremor | |
| parent | 1598302be65c77c107330dc46fd0dabface3112d (diff) | |
| parent | 8fcbe5835d038649e70da410d46c4f5cd502c261 (diff) | |
| download | mpv-efcc9ad7120e01a17fc3659cb0229135b1cebb95.tar.bz2 mpv-efcc9ad7120e01a17fc3659cb0229135b1cebb95.tar.xz | |
Merge svn changes up to r30055
Diffstat (limited to 'tremor')
| -rw-r--r-- | tremor/misc.h | 2 | ||||
| -rw-r--r-- | tremor/tremor.diff | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/tremor/misc.h b/tremor/misc.h index 8a235d657b..541019a5bd 100644 --- a/tremor/misc.h +++ b/tremor/misc.h @@ -18,6 +18,7 @@ #ifndef _V_RANDOM_H_ #define _V_RANDOM_H_ #include "ivorbiscodec.h" +#include "codec_internal.h" #include "os_types.h" #include "asm_arm.h" @@ -29,6 +30,7 @@ /* 64 bit multiply */ #include <sys/types.h> +#include <stdlib.h> #include "config.h" #if !HAVE_BIGENDIAN diff --git a/tremor/tremor.diff b/tremor/tremor.diff index 61e31c751a..c877b953d7 100644 --- a/tremor/tremor.diff +++ b/tremor/tremor.diff @@ -1,9 +1,18 @@ --- misc.h 2005-01-04 16:29:01.000000000 +0100 +++ misc.h 2004-12-30 13:09:20.000000000 +0100 -@@ -29,8 +29,9 @@ +@@ -18,6 +18,7 @@ + #ifndef _V_RANDOM_H_ + #define _V_RANDOM_H_ + #include "ivorbiscodec.h" ++#include "codec_internal.h" + #include "os_types.h" + + #include "asm_arm.h" +@@ -29,8 +30,10 @@ /* 64 bit multiply */ #include <sys/types.h> ++#include <stdlib.h> +#include "config.h" -#if BYTE_ORDER==LITTLE_ENDIAN @@ -11,7 +20,7 @@ union magic { struct { ogg_int32_t lo; -@@ -38,9 +39,7 @@ +@@ -38,9 +41,7 @@ } halves; ogg_int64_t whole; }; |