[Ffmpeg-cvslog] CVS: ffmpeg/libavutil avutil.h, 1.1, 1.2 bswap.h, 1.11, 1.12 common.h, 1.158, 1.159

Diego Biurrun CVS diego
Thu Dec 22 02:10:15 CET 2005


Update of /cvsroot/ffmpeg/ffmpeg/libavutil
In directory mail:/var2/tmp/cvs-serv29491/libavutil

Modified Files:
	avutil.h bswap.h common.h 
Log Message:
COSMETICS: tabs --> spaces, some prettyprinting


Index: avutil.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/avutil.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- avutil.h	1 Aug 2005 20:07:04 -0000	1.1
+++ avutil.h	22 Dec 2005 01:10:11 -0000	1.2
@@ -11,14 +11,14 @@
 extern "C" {
 #endif
 
-#define AV_STRINGIFY(s)	AV_TOSTRING(s)
+#define AV_STRINGIFY(s)         AV_TOSTRING(s)
 #define AV_TOSTRING(s) #s
 
-#define LIBAVUTIL_VERSION_INT ((49<<16)+(0<<8)+0)
-#define LIBAVUTIL_VERSION     49.0.0
-#define LIBAVUTIL_BUILD       LIBAVUTIL_VERSION_INT
+#define LIBAVUTIL_VERSION_INT   ((49<<16)+(0<<8)+0)
+#define LIBAVUTIL_VERSION       49.0.0
+#define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
 
-#define LIBAVUTIL_IDENT       "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
+#define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
 
 
 #include "common.h"

Index: bswap.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/bswap.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- bswap.h	17 Dec 2005 18:14:37 -0000	1.11
+++ bswap.h	22 Dec 2005 01:10:11 -0000	1.12
@@ -19,8 +19,8 @@
 #if defined(ARCH_X86) || defined(ARCH_X86_64)
 static always_inline uint16_t bswap_16(uint16_t x)
 {
-  __asm("rorw $8, %0"	:
-        LEGACY_REGS (x)	:
+  __asm("rorw $8, %0"   :
+        LEGACY_REGS (x) :
         "0" (x));
     return x;
 }
@@ -28,13 +28,13 @@
 static always_inline uint32_t bswap_32(uint32_t x)
 {
 #if __CPU__ > 386
- __asm("bswap	%0":
+ __asm("bswap   %0":
       "=r" (x)     :
 #else
- __asm("xchgb	%b0,%h0\n"
-      "	rorl	$16,%0\n"
-      "	xchgb	%b0,%h0":
-      LEGACY_REGS (x)		:
+ __asm("xchgb   %b0,%h0\n"
+      "         rorl    $16,%0\n"
+      "         xchgb   %b0,%h0":
+      LEGACY_REGS (x)                :
 #endif
       "0" (x));
   return x;
@@ -43,8 +43,8 @@
 static inline uint64_t bswap_64(uint64_t x)
 {
 #ifdef ARCH_X86_64
-  __asm("bswap	%0":
-        "=r" (x)     :
+  __asm("bswap  %0":
+        "=r" (x)   :
         "0" (x));
   return x;
 #else
@@ -63,17 +63,17 @@
 #elif defined(ARCH_SH4)
 
 static always_inline uint16_t bswap_16(uint16_t x) {
-	__asm__("swap.b %0,%0":"=r"(x):"0"(x));
-	return x;
+        __asm__("swap.b %0,%0":"=r"(x):"0"(x));
+        return x;
 }
 
 static always_inline uint32_t bswap_32(uint32_t x) {
-	__asm__(
-	"swap.b %0,%0\n"
-	"swap.w %0,%0\n"
-	"swap.b %0,%0\n"
-	:"=r"(x):"0"(x));
-	return x;
+        __asm__(
+        "swap.b %0,%0\n"
+        "swap.w %0,%0\n"
+        "swap.b %0,%0\n"
+        :"=r"(x):"0"(x));
+        return x;
 }
 
 static inline uint64_t bswap_64(uint64_t x)
@@ -129,9 +129,9 @@
     return r.ll;
 #endif
 }
-#endif	/* !ARCH_X86 */
+#endif  /* !ARCH_X86 */
 
-#endif	/* !HAVE_BYTESWAP_H */
+#endif  /* !HAVE_BYTESWAP_H */
 
 // be2me ... BigEndian to MachineEndian
 // le2me ... LittleEndian to MachineEndian

Index: common.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/common.h,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- common.h	17 Dec 2005 18:14:37 -0000	1.158
+++ common.h	22 Dec 2005 01:10:11 -0000	1.159
@@ -453,11 +453,11 @@
 #if defined(ARCH_X86) || defined(ARCH_X86_64)
 #define MASK_ABS(mask, level)\
             asm volatile(\
-		"cdq			\n\t"\
-		"xorl %1, %0		\n\t"\
-		"subl %1, %0		\n\t"\
-		: "+a" (level), "=&d" (mask)\
-	    );
+                "cdq                    \n\t"\
+                "xorl %1, %0            \n\t"\
+                "subl %1, %0            \n\t"\
+                : "+a" (level), "=&d" (mask)\
+            );
 #else
 #define MASK_ABS(mask, level)\
             mask= level>>31;\
@@ -468,10 +468,10 @@
 #if __CPU__ >= 686 && !defined(RUNTIME_CPUDETECT)
 #define COPY3_IF_LT(x,y,a,b,c,d)\
 asm volatile (\
-    "cmpl %0, %3	\n\t"\
-    "cmovl %3, %0	\n\t"\
-    "cmovl %4, %1	\n\t"\
-    "cmovl %5, %2	\n\t"\
+    "cmpl %0, %3        \n\t"\
+    "cmovl %3, %0       \n\t"\
+    "cmovl %4, %1       \n\t"\
+    "cmovl %5, %2       \n\t"\
     : "+r" (x), "+r" (a), "+r" (c)\
     : "r" (y), "r" (b), "r" (d)\
 );
@@ -488,20 +488,20 @@
 #if defined(ARCH_X86_64)
 static inline uint64_t read_time(void)
 {
-	uint64_t a, d;
-	asm volatile(	"rdtsc\n\t"
-		: "=a" (a), "=d" (d)
-	);
-	return (d << 32) | (a & 0xffffffff);
+        uint64_t a, d;
+        asm volatile(   "rdtsc\n\t"
+                : "=a" (a), "=d" (d)
+        );
+        return (d << 32) | (a & 0xffffffff);
 }
 #elif defined(ARCH_X86)
 static inline long long read_time(void)
 {
-	long long l;
-	asm volatile(	"rdtsc\n\t"
-		: "=A" (l)
-	);
-	return l;
+        long long l;
+        asm volatile(   "rdtsc\n\t"
+                : "=A" (l)
+        );
+        return l;
 }
 #else //FIXME check ppc64
 static inline uint64_t read_time(void)





More information about the ffmpeg-cvslog mailing list