[MPlayer-cvslog] CVS: main/libfaad2 local_changes.diff,1.1,1.2

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/libfaad2
In directory mail:/var2/tmp/cvs-serv10916

Modified Files:
	local_changes.diff 
Log Message:
cosmetics: Make diff -R apply without offsets.


Index: local_changes.diff
===================================================================
RCS file: /cvsroot/mplayer/main/libfaad2/local_changes.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- local_changes.diff	16 Feb 2005 18:31:12 -0000	1.1
+++ local_changes.diff	1 Mar 2005 05:49:56 -0000	1.2
@@ -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 @@
  #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 @@
  #endif // FIXED_POINT
  
  #ifdef DRM
-@@ -157,6 +165,7 @@
+@@ -157,6 +166,7 @@
  
  #include <stdlib.h>
  
@@ -46,7 +45,7 @@
  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 @@
  #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 @@
      #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 @@
  #ifdef HAVE_LRINTF
  #  define HAS_LRINTF
  #  define _ISOC9X_SOURCE 1
-@@ -348,8 +379,6 @@
+@@ -348,8 +380,6 @@
  #  define __USE_ISOC99   1
  #endif