diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-09-27 08:33:20 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:18:08 +0200 |
| commit | 426235c2f9be1d3c6fa7fe5eae7a86f7f06457b8 (patch) | |
| tree | 2807bb1b9db476b69b900872628f5c5553b9b90d | |
| parent | 671de0948bebe10dd3ee8051583ec15c5c51fde0 (diff) | |
| download | mpv-426235c2f9be1d3c6fa7fe5eae7a86f7f06457b8.tar.bz2 mpv-426235c2f9be1d3c6fa7fe5eae7a86f7f06457b8.tar.xz | |
libfaad2: cosmetics: Make local_changes.diff apply cleanly
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32384 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libfaad2/local_changes.diff | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libfaad2/local_changes.diff b/libfaad2/local_changes.diff index d24cab1c72..ce0d14078f 100644 --- a/libfaad2/local_changes.diff +++ b/libfaad2/local_changes.diff @@ -52,7 +52,7 @@ typedef unsigned __int64 uint64_t; typedef unsigned __int32 uint32_t; typedef unsigned __int16 uint16_t; -@@ -159,5 +171,9 @@ +@@ -159,6 +171,10 @@ typedef __int32 int32_t; typedef __int16 int16_t; typedef __int8 int8_t; @@ -62,6 +62,7 @@ + typedef float float32_t; + @@ -245,7 +245,7 @@ #endif @@ -80,7 +81,7 @@ #define HAS_LRINTF // from http://www.stereopsis.com/FPU.html static INLINE int lrintf(float f) -@@ -330,5 +346,7 @@ +@@ -330,6 +346,8 @@ #else @@ -88,6 +89,7 @@ + #ifdef HAVE_LRINTF # define HAS_LRINTF + # define _ISOC9X_SOURCE 1 @@ -338,8 +356,6 @@ # define __USE_ISOC99 1 #endif |