diff options
author | Diego Biurrun <diego@biurrun.de> | 2005-12-22 01:10:11 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2005-12-22 01:10:11 +0000 |
commit | bb270c0896b39e1ae9277355e3c120ed3feb64a3 (patch) | |
tree | fc2fc2b1216d19acb3879abb6ea5a3b400f43fe4 /libavutil | |
parent | 50827fcf44f34521df4708cdb633809b56fb9df3 (diff) | |
download | ffmpeg-bb270c0896b39e1ae9277355e3c120ed3feb64a3.tar.gz |
COSMETICS: tabs --> spaces, some prettyprinting
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/avutil.h | 10 | ||||
-rw-r--r-- | libavutil/bswap.h | 38 | ||||
-rw-r--r-- | libavutil/common.h | 38 |
3 files changed, 43 insertions, 43 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index b9f930a561..6ab4b15c31 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -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" diff --git a/libavutil/bswap.h b/libavutil/bswap.h index beaec232f7..6454904420 100644 --- a/libavutil/bswap.h +++ b/libavutil/bswap.h @@ -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 uint16_t bswap_16(uint16_t x) 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 always_inline uint32_t bswap_32(uint32_t x) 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 @@ static inline uint64_t bswap_64(uint64_t x) #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 @@ static inline uint64_t bswap_64(uint64_t x) 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 diff --git a/libavutil/common.h b/libavutil/common.h index 6b05997697..d45ca40aca 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -453,11 +453,11 @@ static inline int ff_get_fourcc(const char *s){ #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 @@ static inline int ff_get_fourcc(const char *s){ #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((y)<(x)){\ #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) |