diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-03-01 05:49:56 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-03-01 05:49:56 +0000 |
| commit | 2fd5f90a32711ad79293e3f946ce763eb3cd470f (patch) | |
| tree | e54f8952b1c1c8b0d3ec5cd27a4281ae236ef45a /libfaad2 | |
| parent | 91e58712dff4d0796c19792bf1e25337c7c6c277 (diff) | |
| download | mpv-2fd5f90a32711ad79293e3f946ce763eb3cd470f.tar.bz2 mpv-2fd5f90a32711ad79293e3f946ce763eb3cd470f.tar.xz | |
cosmetics: Make diff -R apply without offsets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14859 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2')
| -rw-r--r-- | libfaad2/local_changes.diff | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libfaad2/local_changes.diff b/libfaad2/local_changes.diff index 3eadd074d1..9857181279 100644 --- a/libfaad2/local_changes.diff +++ b/libfaad2/local_changes.diff @@ -1,6 +1,6 @@ --- libfaad/bits.h 2004-03-11 14:32:39.000000000 +0100 +++ libfaad2/bits.h 2004-06-24 10:47:02.000000000 +0200 -@@ -58,7 +60,7 @@ +@@ -58,7 +61,7 @@ #if defined (_WIN32) && !defined(_WIN32_WCE) && !defined(__MINGW32__) #define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax @@ -9,10 +9,9 @@ #define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) ) #else #define BSWAP(a) \ -diff -u libfaad/common.h /usr/src/mplayer/main/libfaad2/common.h --- libfaad/common.h 2004-06-30 14:45:56.000000000 +0200 +++ libfaad2/common.h 2004-10-19 03:16:03.000000000 +0200 -@@ -32,10 +34,13 @@ +@@ -32,10 +35,13 @@ extern "C" { #endif @@ -28,7 +27,7 @@ diff -u libfaad/common.h /usr/src/mplayer/main/libfaad2/common.h #define INLINE __inline #if 0 //defined(_WIN32) && !defined(_WIN32_WCE) #define ALIGN __declspec(align(16)) -@@ -117,6 +122,9 @@ +@@ -117,6 +123,9 @@ # ifdef MAIN_DEC # undef MAIN_DEC # endif @@ -38,7 +37,7 @@ diff -u libfaad/common.h /usr/src/mplayer/main/libfaad2/common.h #endif // FIXED_POINT #ifdef DRM -@@ -157,6 +165,7 @@ +@@ -157,6 +166,7 @@ #include <stdlib.h> @@ -46,7 +45,7 @@ diff -u libfaad/common.h /usr/src/mplayer/main/libfaad2/common.h typedef unsigned __int64 uint64_t; typedef unsigned __int32 uint32_t; typedef unsigned __int16 uint16_t; -@@ -165,11 +174,31 @@ +@@ -165,11 +175,31 @@ typedef __int32 int32_t; typedef __int16 int16_t; typedef __int8 int8_t; @@ -78,7 +77,7 @@ diff -u libfaad/common.h /usr/src/mplayer/main/libfaad2/common.h #include <stdio.h> #if HAVE_SYS_TYPES_H # include <sys/types.h> -@@ -311,7 +340,7 @@ +@@ -311,7 +341,7 @@ } return i; } @@ -87,7 +86,7 @@ diff -u libfaad/common.h /usr/src/mplayer/main/libfaad2/common.h #define HAS_LRINTF // from http://www.stereopsis.com/FPU.html static INLINE int lrintf(float f) -@@ -340,6 +369,8 @@ +@@ -340,6 +370,8 @@ #else @@ -96,7 +95,7 @@ diff -u libfaad/common.h /usr/src/mplayer/main/libfaad2/common.h #ifdef HAVE_LRINTF # define HAS_LRINTF # define _ISOC9X_SOURCE 1 -@@ -348,8 +379,6 @@ +@@ -348,8 +380,6 @@ # define __USE_ISOC99 1 #endif |