cosmetics attack, part I: Remove all tabs and prettyprint/reindent the code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23158 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 2309 insertions, 2310 deletions

diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c
index c089e39fa7..6dab0aa539 100644
--- a/libswscale/rgb2rgb_template.c
+++ b/libswscale/rgb2rgb_template.c
@@ -1,5 +1,4 @@
 /*
- *
  *  rgb2rgb.c, Software RGB to RGB convertor
  *  pluralize by Software PAL8 to RGB convertor
  *               Software YUV to YUV convertor
@@ -53,11 +52,11 @@
 #ifdef HAVE_3DNOW
 #define PREFETCH  "prefetch"
 #define PREFETCHW "prefetchw"
-#define PAVGB	  "pavgusb"
+#define PAVGB     "pavgusb"
 #elif defined ( HAVE_MMX2 )
 #define PREFETCH "prefetchnta"
 #define PREFETCHW "prefetcht0"
-#define PAVGB	  "pavgb"
+#define PAVGB     "pavgb"
 #else
 #ifdef __APPLE__
 #define PREFETCH "#"
@@ -85,148 +84,148 @@
 
 static inline void RENAME(rgb24to32)(const uint8_t *src,uint8_t *dst,long src_size)
 {
-  uint8_t *dest = dst;
-  const uint8_t *s = src;
-  const uint8_t *end;
-#ifdef HAVE_MMX
-  const uint8_t *mm_end;
-#endif
-  end = s + src_size;
-#ifdef HAVE_MMX
-  __asm __volatile(PREFETCH"	%0"::"m"(*s):"memory");
-  mm_end = end - 23;
-  __asm __volatile("movq	%0, %%mm7"::"m"(mask32):"memory");
-  while(s < mm_end)
-  {
-    __asm __volatile(
-	PREFETCH"	32%1\n\t"
-	"movd	%1, %%mm0\n\t"
-	"punpckldq 3%1, %%mm0\n\t"
-	"movd	6%1, %%mm1\n\t"
-	"punpckldq 9%1, %%mm1\n\t"
-	"movd	12%1, %%mm2\n\t"
-	"punpckldq 15%1, %%mm2\n\t"
-	"movd	18%1, %%mm3\n\t"
-	"punpckldq 21%1, %%mm3\n\t"
-	"pand	%%mm7, %%mm0\n\t"
-	"pand	%%mm7, %%mm1\n\t"
-	"pand	%%mm7, %%mm2\n\t"
-	"pand	%%mm7, %%mm3\n\t"
-	MOVNTQ"	%%mm0, %0\n\t"
-	MOVNTQ"	%%mm1, 8%0\n\t"
-	MOVNTQ"	%%mm2, 16%0\n\t"
-	MOVNTQ"	%%mm3, 24%0"
-	:"=m"(*dest)
-	:"m"(*s)
-	:"memory");
-    dest += 32;
-    s += 24;
-  }
-  __asm __volatile(SFENCE:::"memory");
-  __asm __volatile(EMMS:::"memory");
-#endif
-  while(s < end)
-  {
-#ifdef WORDS_BIGENDIAN
-    /* RGB24 (= R,G,B) -> RGB32 (= A,B,G,R) */
-    *dest++ = 0;
-    *dest++ = s[2];
-    *dest++ = s[1];
-    *dest++ = s[0];
-    s+=3;
-#else
-    *dest++ = *s++;
-    *dest++ = *s++;
-    *dest++ = *s++;
-    *dest++ = 0;
-#endif
-  }
+    uint8_t *dest = dst;
+    const uint8_t *s = src;
+    const uint8_t *end;
+    #ifdef HAVE_MMX
+        const uint8_t *mm_end;
+    #endif
+    end = s + src_size;
+    #ifdef HAVE_MMX
+        __asm __volatile(PREFETCH"    %0"::"m"(*s):"memory");
+        mm_end = end - 23;
+        __asm __volatile("movq        %0, %%mm7"::"m"(mask32):"memory");
+        while (s < mm_end)
+        {
+            __asm __volatile(
+            PREFETCH"    32%1           \n\t"
+            "movd          %1, %%mm0    \n\t"
+            "punpckldq    3%1, %%mm0    \n\t"
+            "movd         6%1, %%mm1    \n\t"
+            "punpckldq    9%1, %%mm1    \n\t"
+            "movd        12%1, %%mm2    \n\t"
+            "punpckldq   15%1, %%mm2    \n\t"
+            "movd        18%1, %%mm3    \n\t"
+            "punpckldq   21%1, %%mm3    \n\t"
+            "pand       %%mm7, %%mm0    \n\t"
+            "pand       %%mm7, %%mm1    \n\t"
+            "pand       %%mm7, %%mm2    \n\t"
+            "pand       %%mm7, %%mm3    \n\t"
+            MOVNTQ"     %%mm0,   %0     \n\t"
+            MOVNTQ"     %%mm1,  8%0     \n\t"
+            MOVNTQ"     %%mm2, 16%0     \n\t"
+            MOVNTQ"     %%mm3, 24%0"
+            :"=m"(*dest)
+            :"m"(*s)
+            :"memory");
+            dest += 32;
+            s += 24;
+        }
+        __asm __volatile(SFENCE:::"memory");
+        __asm __volatile(EMMS:::"memory");
+    #endif
+    while (s < end)
+    {
+    #ifdef WORDS_BIGENDIAN
+        /* RGB24 (= R,G,B) -> RGB32 (= A,B,G,R) */
+        *dest++ = 0;
+        *dest++ = s[2];
+        *dest++ = s[1];
+        *dest++ = s[0];
+        s+=3;
+    #else
+        *dest++ = *s++;
+        *dest++ = *s++;
+        *dest++ = *s++;
+        *dest++ = 0;
+    #endif
+    }
 }
 
 static inline void RENAME(rgb32to24)(const uint8_t *src,uint8_t *dst,long src_size)
 {
-  uint8_t *dest = dst;
-  const uint8_t *s = src;
-  const uint8_t *end;
+    uint8_t *dest = dst;
+    const uint8_t *s = src;
+    const uint8_t *end;
 #ifdef HAVE_MMX
-  const uint8_t *mm_end;
+    const uint8_t *mm_end;
 #endif
-  end = s + src_size;
+    end = s + src_size;
 #ifdef HAVE_MMX
-  __asm __volatile(PREFETCH"	%0"::"m"(*s):"memory");
-  mm_end = end - 31;
-  while(s < mm_end)
-  {
-    __asm __volatile(
-	PREFETCH"	32%1\n\t"
-	"movq	%1, %%mm0\n\t"
-	"movq	8%1, %%mm1\n\t"
-	"movq	16%1, %%mm4\n\t"
-	"movq	24%1, %%mm5\n\t"
-	"movq	%%mm0, %%mm2\n\t"
-	"movq	%%mm1, %%mm3\n\t"
-	"movq	%%mm4, %%mm6\n\t"
-	"movq	%%mm5, %%mm7\n\t"
-	"psrlq	$8, %%mm2\n\t"
-	"psrlq	$8, %%mm3\n\t"
-	"psrlq	$8, %%mm6\n\t"
-	"psrlq	$8, %%mm7\n\t"
-	"pand	%2, %%mm0\n\t"
-	"pand	%2, %%mm1\n\t"
-	"pand	%2, %%mm4\n\t"
-	"pand	%2, %%mm5\n\t"
-	"pand	%3, %%mm2\n\t"
-	"pand	%3, %%mm3\n\t"
-	"pand	%3, %%mm6\n\t"
-	"pand	%3, %%mm7\n\t"
-	"por	%%mm2, %%mm0\n\t"
-	"por	%%mm3, %%mm1\n\t"
-	"por	%%mm6, %%mm4\n\t"
-	"por	%%mm7, %%mm5\n\t"
-
-	"movq	%%mm1, %%mm2\n\t"
-	"movq	%%mm4, %%mm3\n\t"
-	"psllq	$48, %%mm2\n\t"
-	"psllq	$32, %%mm3\n\t"
-	"pand	%4, %%mm2\n\t"
-	"pand	%5, %%mm3\n\t"
-	"por	%%mm2, %%mm0\n\t"
-	"psrlq	$16, %%mm1\n\t"
-	"psrlq	$32, %%mm4\n\t"
-	"psllq	$16, %%mm5\n\t"
-	"por	%%mm3, %%mm1\n\t"
-	"pand	%6, %%mm5\n\t"
-	"por	%%mm5, %%mm4\n\t"
-
-	MOVNTQ"	%%mm0, %0\n\t"
-	MOVNTQ"	%%mm1, 8%0\n\t"
-	MOVNTQ"	%%mm4, 16%0"
-	:"=m"(*dest)
-	:"m"(*s),"m"(mask24l),
-	 "m"(mask24h),"m"(mask24hh),"m"(mask24hhh),"m"(mask24hhhh)
-	:"memory");
-    dest += 24;
-    s += 32;
-  }
-  __asm __volatile(SFENCE:::"memory");
-  __asm __volatile(EMMS:::"memory");
-#endif
-  while(s < end)
-  {
+    __asm __volatile(PREFETCH"    %0"::"m"(*s):"memory");
+    mm_end = end - 31;
+    while (s < mm_end)
+    {
+        __asm __volatile(
+        PREFETCH"    32%1           \n\t"
+        "movq          %1, %%mm0    \n\t"
+        "movq         8%1, %%mm1    \n\t"
+        "movq        16%1, %%mm4    \n\t"
+        "movq        24%1, %%mm5    \n\t"
+        "movq       %%mm0, %%mm2    \n\t"
+        "movq       %%mm1, %%mm3    \n\t"
+        "movq       %%mm4, %%mm6    \n\t"
+        "movq       %%mm5, %%mm7    \n\t"
+        "psrlq         $8, %%mm2    \n\t"
+        "psrlq         $8, %%mm3    \n\t"
+        "psrlq         $8, %%mm6    \n\t"
+        "psrlq         $8, %%mm7    \n\t"
+        "pand          %2, %%mm0    \n\t"
+        "pand          %2, %%mm1    \n\t"
+        "pand          %2, %%mm4    \n\t"
+        "pand          %2, %%mm5    \n\t"
+        "pand          %3, %%mm2    \n\t"
+        "pand          %3, %%mm3    \n\t"
+        "pand          %3, %%mm6    \n\t"
+        "pand          %3, %%mm7    \n\t"
+        "por        %%mm2, %%mm0    \n\t"
+        "por        %%mm3, %%mm1    \n\t"
+        "por        %%mm6, %%mm4    \n\t"
+        "por        %%mm7, %%mm5    \n\t"
+
+        "movq       %%mm1, %%mm2    \n\t"
+        "movq       %%mm4, %%mm3    \n\t"
+        "psllq        $48, %%mm2    \n\t"
+        "psllq        $32, %%mm3    \n\t"
+        "pand          %4, %%mm2    \n\t"
+        "pand          %5, %%mm3    \n\t"
+        "por        %%mm2, %%mm0    \n\t"
+        "psrlq        $16, %%mm1    \n\t"
+        "psrlq        $32, %%mm4    \n\t"
+        "psllq        $16, %%mm5    \n\t"
+        "por        %%mm3, %%mm1    \n\t"
+        "pand          %6, %%mm5    \n\t"
+        "por        %%mm5, %%mm4    \n\t"
+
+        MOVNTQ"     %%mm0,   %0     \n\t"
+        MOVNTQ"     %%mm1,  8%0     \n\t"
+        MOVNTQ"     %%mm4, 16%0"
+        :"=m"(*dest)
+        :"m"(*s),"m"(mask24l),
+         "m"(mask24h),"m"(mask24hh),"m"(mask24hhh),"m"(mask24hhhh)
+        :"memory");
+        dest += 24;
+        s += 32;
+    }
+    __asm __volatile(SFENCE:::"memory");
+    __asm __volatile(EMMS:::"memory");
+#endif
+    while (s < end)
+    {
 #ifdef WORDS_BIGENDIAN
-    /* RGB32 (= A,B,G,R) -> RGB24 (= R,G,B) */
-    s++;
-    dest[2] = *s++;
-    dest[1] = *s++;
-    dest[0] = *s++;
-    dest += 3;
+        /* RGB32 (= A,B,G,R) -> RGB24 (= R,G,B) */
+        s++;
+        dest[2] = *s++;
+        dest[1] = *s++;
+        dest[0] = *s++;
+        dest += 3;
 #else
-    *dest++ = *s++;
-    *dest++ = *s++;
-    *dest++ = *s++;
-    s++;
+        *dest++ = *s++;
+        *dest++ = *s++;
+        *dest++ = *s++;
+        s++;
 #endif
-  }
+    }
 }
 
 /*
@@ -237,677 +236,677 @@ static inline void RENAME(rgb32to24)(const uint8_t *src,uint8_t *dst,long src_si
 */
 static inline void RENAME(rgb15to16)(const uint8_t *src,uint8_t *dst,long src_size)
 {
-  register const uint8_t* s=src;
-  register uint8_t* d=dst;
-  register const uint8_t *end;
-  const uint8_t *mm_end;
-  end = s + src_size;
+    register const uint8_t* s=src;
+    register uint8_t* d=dst;
+    register const uint8_t *end;
+    const uint8_t *mm_end;
+    end = s + src_size;
 #ifdef HAVE_MMX
-  __asm __volatile(PREFETCH"	%0"::"m"(*s));
-  __asm __volatile("movq	%0, %%mm4"::"m"(mask15s));
-  mm_end = end - 15;
-  while(s<mm_end)
-  {
-	__asm __volatile(
-		PREFETCH"	32%1\n\t"
-		"movq	%1, %%mm0\n\t"
-		"movq	8%1, %%mm2\n\t"
-		"movq	%%mm0, %%mm1\n\t"
-		"movq	%%mm2, %%mm3\n\t"
-		"pand	%%mm4, %%mm0\n\t"
-		"pand	%%mm4, %%mm2\n\t"
-		"paddw	%%mm1, %%mm0\n\t"
-		"paddw	%%mm3, %%mm2\n\t"
-		MOVNTQ"	%%mm0, %0\n\t"
-		MOVNTQ"	%%mm2, 8%0"
-		:"=m"(*d)
-		:"m"(*s)
-		);
-	d+=16;
-	s+=16;
-  }
-  __asm __volatile(SFENCE:::"memory");
-  __asm __volatile(EMMS:::"memory");
+    __asm __volatile(PREFETCH"    %0"::"m"(*s));
+    __asm __volatile("movq        %0, %%mm4"::"m"(mask15s));
+    mm_end = end - 15;
+    while (s<mm_end)
+    {
+        __asm __volatile(
+        PREFETCH"  32%1         \n\t"
+        "movq        %1, %%mm0  \n\t"
+        "movq       8%1, %%mm2  \n\t"
+        "movq     %%mm0, %%mm1  \n\t"
+        "movq     %%mm2, %%mm3  \n\t"
+        "pand     %%mm4, %%mm0  \n\t"
+        "pand     %%mm4, %%mm2  \n\t"
+        "paddw    %%mm1, %%mm0  \n\t"
+        "paddw    %%mm3, %%mm2  \n\t"
+        MOVNTQ"   %%mm0,  %0    \n\t"
+        MOVNTQ"   %%mm2, 8%0"
+        :"=m"(*d)
+        :"m"(*s)
+        );
+        d+=16;
+        s+=16;
+    }
+    __asm __volatile(SFENCE:::"memory");
+    __asm __volatile(EMMS:::"memory");
 #endif
     mm_end = end - 3;
-    while(s < mm_end)
+    while (s < mm_end)
     {
-	register unsigned x= *((uint32_t *)s);
-	*((uint32_t *)d) = (x&0x7FFF7FFF) + (x&0x7FE07FE0);
-	d+=4;
-	s+=4;
+        register unsigned x= *((uint32_t *)s);
+        *((uint32_t *)d) = (x&0x7FFF7FFF) + (x&0x7FE07FE0);
+        d+=4;
+        s+=4;
     }
-    if(s < end)
+    if (s < end)
     {
-	register unsigned short x= *((uint16_t *)s);
-	*((uint16_t *)d) = (x&0x7FFF) + (x&0x7FE0);
+        register unsigned short x= *((uint16_t *)s);
+        *((uint16_t *)d) = (x&0x7FFF) + (x&0x7FE0);
     }
 }
 
 static inline void RENAME(rgb16to15)(const uint8_t *src,uint8_t *dst,long src_size)
 {
-  register const uint8_t* s=src;
-  register uint8_t* d=dst;
-  register const uint8_t *end;
-  const uint8_t *mm_end;
-  end = s + src_size;
+    register const uint8_t* s=src;
+    register uint8_t* d=dst;
+    register const uint8_t *end;
+    const uint8_t *mm_end;
+    end = s + src_size;
 #ifdef HAVE_MMX
-  __asm __volatile(PREFETCH"	%0"::"m"(*s));
-  __asm __volatile("movq	%0, %%mm7"::"m"(mask15rg));
-  __asm __volatile("movq	%0, %%mm6"::"m"(mask15b));
-  mm_end = end - 15;
-  while(s<mm_end)
-  {
-	__asm __volatile(
-		PREFETCH"	32%1\n\t"
-		"movq	%1, %%mm0\n\t"
-		"movq	8%1, %%mm2\n\t"
-		"movq	%%mm0, %%mm1\n\t"
-		"movq	%%mm2, %%mm3\n\t"
-		"psrlq	$1, %%mm0\n\t"
-		"psrlq	$1, %%mm2\n\t"
-		"pand	%%mm7, %%mm0\n\t"
-		"pand	%%mm7, %%mm2\n\t"
-		"pand	%%mm6, %%mm1\n\t"
-		"pand	%%mm6, %%mm3\n\t"
-		"por	%%mm1, %%mm0\n\t"
-		"por	%%mm3, %%mm2\n\t"
-		MOVNTQ"	%%mm0, %0\n\t"
-		MOVNTQ"	%%mm2, 8%0"
-		:"=m"(*d)
-		:"m"(*s)
-		);
-	d+=16;
-	s+=16;
-  }
-  __asm __volatile(SFENCE:::"memory");
-  __asm __volatile(EMMS:::"memory");
+    __asm __volatile(PREFETCH"    %0"::"m"(*s));
+    __asm __volatile("movq        %0, %%mm7"::"m"(mask15rg));
+    __asm __volatile("movq        %0, %%mm6"::"m"(mask15b));
+    mm_end = end - 15;
+    while (s<mm_end)
+    {
+        __asm __volatile(
+        PREFETCH"  32%1         \n\t"
+        "movq        %1, %%mm0  \n\t"
+        "movq       8%1, %%mm2  \n\t"
+        "movq     %%mm0, %%mm1  \n\t"
+        "movq     %%mm2, %%mm3  \n\t"
+        "psrlq       $1, %%mm0  \n\t"
+        "psrlq       $1, %%mm2  \n\t"
+        "pand     %%mm7, %%mm0  \n\t"
+        "pand     %%mm7, %%mm2  \n\t"
+        "pand     %%mm6, %%mm1  \n\t"
+        "pand     %%mm6, %%mm3  \n\t"
+        "por      %%mm1, %%mm0  \n\t"
+        "por      %%mm3, %%mm2  \n\t"
+        MOVNTQ"   %%mm0,  %0    \n\t"
+        MOVNTQ"   %%mm2, 8%0"
+        :"=m"(*d)
+        :"m"(*s)
+        );
+        d+=16;
+        s+=16;
+    }
+    __asm __volatile(SFENCE:::"memory");
+    __asm __volatile(EMMS:::"memory");
 #endif
     mm_end = end - 3;
-    while(s < mm_end)
+    while (s < mm_end)
     {
-	register uint32_t x= *((uint32_t *)s);
-	*((uint32_t *)d) = ((x>>1)&0x7FE07FE0) | (x&0x001F001F);
-	s+=4;
-	d+=4;
+        register uint32_t x= *((uint32_t *)s);
+        *((uint32_t *)d) = ((x>>1)&0x7FE07FE0) | (x&0x001F001F);
+        s+=4;
+        d+=4;
     }
-    if(s < end)
+    if (s < end)
     {
-	register uint16_t x= *((uint16_t *)s);
-	*((uint16_t *)d) = ((x>>1)&0x7FE0) | (x&0x001F);
-	s+=2;
-	d+=2;
+        register uint16_t x= *((uint16_t *)s);
+        *((uint16_t *)d) = ((x>>1)&0x7FE0) | (x&0x001F);
+        s+=2;
+        d+=2;
     }
 }
 
 static inline void RENAME(rgb32to16)(const uint8_t *src, uint8_t *dst, long src_size)
 {
-	const uint8_t *s = src;
-	const uint8_t *end;
+    const uint8_t *s = src;
+    const uint8_t *end;
 #ifdef HAVE_MMX
-	const uint8_t *mm_end;
+    const uint8_t *mm_end;
 #endif
-	uint16_t *d = (uint16_t *)dst;
-	end = s + src_size;
+    uint16_t *d = (uint16_t *)dst;
+    end = s + src_size;
 #ifdef HAVE_MMX
-	mm_end = end - 15;
+    mm_end = end - 15;
 #if 1 //is faster only if multiplies are reasonable fast (FIXME figure out on which cpus this is faster, on Athlon its slightly faster)
-	asm volatile(
-		"movq %3, %%mm5			\n\t"
-		"movq %4, %%mm6			\n\t"
-		"movq %5, %%mm7			\n\t"
-		"jmp 2f				\n\t"
-		ASMALIGN(4)
-		"1:				\n\t"
-		PREFETCH" 32(%1)		\n\t"
-		"movd	(%1), %%mm0		\n\t"
-		"movd	4(%1), %%mm3		\n\t"
-		"punpckldq 8(%1), %%mm0		\n\t"
-		"punpckldq 12(%1), %%mm3	\n\t"
-		"movq %%mm0, %%mm1		\n\t"
-		"movq %%mm3, %%mm4		\n\t"
-		"pand %%mm6, %%mm0		\n\t"
-		"pand %%mm6, %%mm3		\n\t"
-		"pmaddwd %%mm7, %%mm0		\n\t"
-		"pmaddwd %%mm7, %%mm3		\n\t"
-		"pand %%mm5, %%mm1		\n\t"
-		"pand %%mm5, %%mm4		\n\t"
-		"por %%mm1, %%mm0		\n\t"
-		"por %%mm4, %%mm3		\n\t"
-		"psrld $5, %%mm0		\n\t"
-		"pslld $11, %%mm3		\n\t"
-		"por %%mm3, %%mm0		\n\t"
-		MOVNTQ"	%%mm0, (%0)		\n\t"
-		"add $16, %1			\n\t"
-		"add $8, %0			\n\t"
-		"2:				\n\t"
-		"cmp %2, %1			\n\t"
-		" jb 1b				\n\t"
-		: "+r" (d), "+r"(s)
-		: "r" (mm_end), "m" (mask3216g), "m" (mask3216br), "m" (mul3216)
-	);
+    asm volatile(
+    "movq           %3, %%mm5   \n\t"
+    "movq           %4, %%mm6   \n\t"
+    "movq           %5, %%mm7   \n\t"
+    "jmp 2f                     \n\t"
+    ASMALIGN(4)
+    "1:                         \n\t"
+    PREFETCH"   32(%1)          \n\t"
+    "movd         (%1), %%mm0   \n\t"
+    "movd        4(%1), %%mm3   \n\t"
+    "punpckldq   8(%1), %%mm0   \n\t"
+    "punpckldq  12(%1), %%mm3   \n\t"
+    "movq        %%mm0, %%mm1   \n\t"
+    "movq        %%mm3, %%mm4   \n\t"
+    "pand        %%mm6, %%mm0   \n\t"
+    "pand        %%mm6, %%mm3   \n\t"
+    "pmaddwd     %%mm7, %%mm0   \n\t"
+    "pmaddwd     %%mm7, %%mm3   \n\t"
+    "pand        %%mm5, %%mm1   \n\t"
+    "pand        %%mm5, %%mm4   \n\t"
+    "por         %%mm1, %%mm0   \n\t"
+    "por         %%mm4, %%mm3   \n\t"
+    "psrld          $5, %%mm0   \n\t"
+    "pslld         $11, %%mm3   \n\t"
+    "por         %%mm3, %%mm0   \n\t"
+    MOVNTQ"      %%mm0, (%0)    \n\t"
+    "add           $16,  %1     \n\t"
+    "add            $8,  %0     \n\t"
+    "2:                         \n\t"
+    "cmp            %2,  %1     \n\t"
+    " jb            1b          \n\t"
+    : "+r" (d), "+r"(s)
+    : "r" (mm_end), "m" (mask3216g), "m" (mask3216br), "m" (mul3216)
+    );
 #else
-	__asm __volatile(PREFETCH"	%0"::"m"(*src):"memory");
-	__asm __volatile(
-	    "movq	%0, %%mm7\n\t"
-	    "movq	%1, %%mm6\n\t"
-	    ::"m"(red_16mask),"m"(green_16mask));
-	while(s < mm_end)
-	{
-	    __asm __volatile(
-		PREFETCH" 32%1\n\t"
-		"movd	%1, %%mm0\n\t"
-		"movd	4%1, %%mm3\n\t"
-		"punpckldq 8%1, %%mm0\n\t"
-		"punpckldq 12%1, %%mm3\n\t"
-		"movq	%%mm0, %%mm1\n\t"
-		"movq	%%mm0, %%mm2\n\t"
-		"movq	%%mm3, %%mm4\n\t"
-		"movq	%%mm3, %%mm5\n\t"
-		"psrlq	$3, %%mm0\n\t"
-		"psrlq	$3, %%mm3\n\t"
-		"pand	%2, %%mm0\n\t"
-		"pand	%2, %%mm3\n\t"
-		"psrlq	$5, %%mm1\n\t"
-		"psrlq	$5, %%mm4\n\t"
-		"pand	%%mm6, %%mm1\n\t"
-		"pand	%%mm6, %%mm4\n\t"
-		"psrlq	$8, %%mm2\n\t"
-		"psrlq	$8, %%mm5\n\t"
-		"pand	%%mm7, %%mm2\n\t"
-		"pand	%%mm7, %%mm5\n\t"
-		"por	%%mm1, %%mm0\n\t"
-		"por	%%mm4, %%mm3\n\t"
-		"por	%%mm2, %%mm0\n\t"
-		"por	%%mm5, %%mm3\n\t"
-		"psllq	$16, %%mm3\n\t"
-		"por	%%mm3, %%mm0\n\t"
-		MOVNTQ"	%%mm0, %0\n\t"
-		:"=m"(*d):"m"(*s),"m"(blue_16mask):"memory");
-		d += 4;
-		s += 16;
-	}
-#endif
-	__asm __volatile(SFENCE:::"memory");
-	__asm __volatile(EMMS:::"memory");
-#endif
-	while(s < end)
-	{
-		register int rgb = *(uint32_t*)s; s += 4;
-		*d++ = ((rgb&0xFF)>>3) + ((rgb&0xFC00)>>5) + ((rgb&0xF80000)>>8);
-	}
+    __asm __volatile(PREFETCH"    %0"::"m"(*src):"memory");
+    __asm __volatile(
+        "movq    %0, %%mm7    \n\t"
+        "movq    %1, %%mm6    \n\t"
+        ::"m"(red_16mask),"m"(green_16mask));
+    while (s < mm_end)
+    {
+        __asm __volatile(
+        PREFETCH"    32%1           \n\t"
+        "movd          %1, %%mm0    \n\t"
+        "movd         4%1, %%mm3    \n\t"
+        "punpckldq    8%1, %%mm0    \n\t"
+        "punpckldq   12%1, %%mm3    \n\t"
+        "movq       %%mm0, %%mm1    \n\t"
+        "movq       %%mm0, %%mm2    \n\t"
+        "movq       %%mm3, %%mm4    \n\t"
+        "movq       %%mm3, %%mm5    \n\t"
+        "psrlq         $3, %%mm0    \n\t"
+        "psrlq         $3, %%mm3    \n\t"
+        "pand          %2, %%mm0    \n\t"
+        "pand          %2, %%mm3    \n\t"
+        "psrlq         $5, %%mm1    \n\t"
+        "psrlq         $5, %%mm4    \n\t"
+        "pand       %%mm6, %%mm1    \n\t"
+        "pand       %%mm6, %%mm4    \n\t"
+        "psrlq         $8, %%mm2    \n\t"
+        "psrlq         $8, %%mm5    \n\t"
+        "pand       %%mm7, %%mm2    \n\t"
+        "pand       %%mm7, %%mm5    \n\t"
+        "por        %%mm1, %%mm0    \n\t"
+        "por        %%mm4, %%mm3    \n\t"
+        "por        %%mm2, %%mm0    \n\t"
+        "por        %%mm5, %%mm3    \n\t"
+        "psllq        $16, %%mm3    \n\t"
+        "por        %%mm3, %%mm0    \n\t"
+        MOVNTQ"     %%mm0, %0       \n\t"
+        :"=m"(*d):"m"(*s),"m"(blue_16mask):"memory");
+        d += 4;
+        s += 16;
+    }
+#endif
+    __asm __volatile(SFENCE:::"memory");
+    __asm __volatile(EMMS:::"memory");
+#endif
+    while (s < end)
+    {
+        register int rgb = *(uint32_t*)s; s += 4;
+        *d++ = ((rgb&0xFF)>>3) + ((rgb&0xFC00)>>5) + ((rgb&0xF80000)>>8);
+    }
 }
 
 static inline void RENAME(rgb32tobgr16)(const uint8_t *src, uint8_t *dst, long src_size)
 {
-	const uint8_t *s = src;
-	const uint8_t *end;
+    const uint8_t *s = src;
+    const uint8_t *end;
 #ifdef HAVE_MMX
-	const uint8_t *mm_end;
+    const uint8_t *mm_end;
 #endif
-	uint16_t *d = (uint16_t *)dst;
-	end = s + src_size;
+    uint16_t *d = (uint16_t *)dst;
+    end = s + src_size;
 #ifdef HAVE_MMX
-	__asm __volatile(PREFETCH"	%0"::"m"(*src):"memory");
-	__asm __volatile(
-	    "movq	%0, %%mm7\n\t"
-	    "movq	%1, %%mm6\n\t"
-	    ::"m"(red_16mask),"m"(green_16mask));
-	mm_end = end - 15;
-	while(s < mm_end)
-	{
-	    __asm __volatile(
-		PREFETCH" 32%1\n\t"
-		"movd	%1, %%mm0\n\t"
-		"movd	4%1, %%mm3\n\t"
-		"punpckldq 8%1, %%mm0\n\t"
-		"punpckldq 12%1, %%mm3\n\t"
-		"movq	%%mm0, %%mm1\n\t"
-		"movq	%%mm0, %%mm2\n\t"
-		"movq	%%mm3, %%mm4\n\t"
-		"movq	%%mm3, %%mm5\n\t"
-		"psllq	$8, %%mm0\n\t"
-		"psllq	$8, %%mm3\n\t"
-		"pand	%%mm7, %%mm0\n\t"
-		"pand	%%mm7, %%mm3\n\t"
-		"psrlq	$5, %%mm1\n\t"
-		"psrlq	$5, %%mm4\n\t"
-		"pand	%%mm6, %%mm1\n\t"
-		"pand	%%mm6, %%mm4\n\t"
-		"psrlq	$19, %%mm2\n\t"
-		"psrlq	$19, %%mm5\n\t"
-		"pand	%2, %%mm2\n\t"
-		"pand	%2, %%mm5\n\t"
-		"por	%%mm1, %%mm0\n\t"
-		"por	%%mm4, %%mm3\n\t"
-		"por	%%mm2, %%mm0\n\t"
-		"por	%%mm5, %%mm3\n\t"
-		"psllq	$16, %%mm3\n\t"
-		"por	%%mm3, %%mm0\n\t"
-		MOVNTQ"	%%mm0, %0\n\t"
-		:"=m"(*d):"m"(*s),"m"(blue_16mask):"memory");
-		d += 4;
-		s += 16;
-	}
-	__asm __volatile(SFENCE:::"memory");
-	__asm __volatile(EMMS:::"memory");
-#endif
-	while(s < end)
-	{
-		register int rgb = *(uint32_t*)s; s += 4;
-		*d++ = ((rgb&0xF8)<<8) + ((rgb&0xFC00)>>5) + ((rgb&0xF80000)>>19);
-	}
+    __asm __volatile(PREFETCH"    %0"::"m"(*src):"memory");
+    __asm __volatile(
+        "movq          %0, %%mm7    \n\t"
+        "movq          %1, %%mm6    \n\t"
+        ::"m"(red_16mask),"m"(green_16mask));
+    mm_end = end - 15;
+    while (s < mm_end)
+    {
+        __asm __volatile(
+        PREFETCH"    32%1           \n\t"
+        "movd          %1, %%mm0    \n\t"
+        "movd         4%1, %%mm3    \n\t"
+        "punpckldq    8%1, %%mm0    \n\t"
+        "punpckldq   12%1, %%mm3    \n\t"
+        "movq       %%mm0, %%mm1    \n\t"
+        "movq       %%mm0, %%mm2    \n\t"
+        "movq       %%mm3, %%mm4    \n\t"
+        "movq       %%mm3, %%mm5    \n\t"
+        "psllq         $8, %%mm0    \n\t"
+        "psllq         $8, %%mm3    \n\t"
+        "pand       %%mm7, %%mm0    \n\t"
+        "pand       %%mm7, %%mm3    \n\t"
+        "psrlq         $5, %%mm1    \n\t"
+        "psrlq         $5, %%mm4    \n\t"
+        "pand       %%mm6, %%mm1    \n\t"
+        "pand       %%mm6, %%mm4    \n\t"
+        "psrlq        $19, %%mm2    \n\t"
+        "psrlq        $19, %%mm5    \n\t"
+        "pand          %2, %%mm2    \n\t"
+        "pand          %2, %%mm5    \n\t"
+        "por        %%mm1, %%mm0    \n\t"
+        "por        %%mm4, %%mm3    \n\t"
+        "por        %%mm2, %%mm0    \n\t"
+        "por        %%mm5, %%mm3    \n\t"
+        "psllq        $16, %%mm3    \n\t"
+        "por        %%mm3, %%mm0    \n\t"
+        MOVNTQ"     %%mm0, %0       \n\t"
+        :"=m"(*d):"m"(*s),"m"(blue_16mask):"memory");
+        d += 4;
+        s += 16;
+    }
+    __asm __volatile(SFENCE:::"memory");
+    __asm __volatile(EMMS:::"memory");
+#endif
+    while (s < end)
+    {
+        register int rgb = *(uint32_t*)s; s += 4;
+        *d++ = ((rgb&0xF8)<<8) + ((rgb&0xFC00)>>5) + ((rgb&0xF80000)>>19);
+    }
 }
 
 static inline void RENAME(rgb32to15)(const uint8_t *src, uint8_t *dst, long src_size)
 {
-	const uint8_t *s = src;
-	const uint8_t *end;
+    const uint8_t *s = src;
+    const uint8_t *end;
 #ifdef HAVE_MMX
-	const uint8_t *mm_end;
+    const uint8_t *mm_end;
 #endif
-	uint16_t *d = (uint16_t *)dst;
-	end = s + src_size;
+    uint16_t *d = (uint16_t *)dst;
+    end = s + src_size;
 #ifdef HAVE_MMX
-	mm_end = end - 15;
+    mm_end = end - 15;
 #if 1 //is faster only if multiplies are reasonable fast (FIXME figure out on which cpus this is faster, on Athlon its slightly faster)
-	asm volatile(
-		"movq %3, %%mm5			\n\t"
-		"movq %4, %%mm6			\n\t"
-		"movq %5, %%mm7			\n\t"
-		"jmp 2f				\n\t"
-		ASMALIGN(4)
-		"1:				\n\t"
-		PREFETCH" 32(%1)		\n\t"
-		"movd	(%1), %%mm0		\n\t"
-		"movd	4(%1), %%mm3		\n\t"
-		"punpckldq 8(%1), %%mm0		\n\t"
-		"punpckldq 12(%1), %%mm3	\n\t"
-		"movq %%mm0, %%mm1		\n\t"
-		"movq %%mm3, %%mm4		\n\t"
-		"pand %%mm6, %%mm0		\n\t"
-		"pand %%mm6, %%mm3		\n\t"
-		"pmaddwd %%mm7, %%mm0		\n\t"
-		"pmaddwd %%mm7, %%mm3		\n\t"
-		"pand %%mm5, %%mm1		\n\t"
-		"pand %%mm5, %%mm4		\n\t"
-		"por %%mm1, %%mm0		\n\t"
-		"por %%mm4, %%mm3		\n\t"
-		"psrld $6, %%mm0		\n\t"
-		"pslld $10, %%mm3		\n\t"
-		"por %%mm3, %%mm0		\n\t"
-		MOVNTQ"	%%mm0, (%0)		\n\t"
-		"add $16, %1			\n\t"
-		"add $8, %0			\n\t"
-		"2:				\n\t"
-		"cmp %2, %1			\n\t"
-		" jb 1b				\n\t"
-		: "+r" (d), "+r"(s)
-		: "r" (mm_end), "m" (mask3215g), "m" (mask3216br), "m" (mul3215)
-	);
+    asm volatile(
+    "movq           %3, %%mm5   \n\t"
+    "movq           %4, %%mm6   \n\t"
+    "movq           %5, %%mm7   \n\t"
+    "jmp            2f          \n\t"
+    ASMALIGN(4)
+    "1:                         \n\t"
+    PREFETCH"   32(%1)          \n\t"
+    "movd         (%1), %%mm0   \n\t"
+    "movd        4(%1), %%mm3   \n\t"
+    "punpckldq   8(%1), %%mm0   \n\t"
+    "punpckldq  12(%1), %%mm3   \n\t"
+    "movq        %%mm0, %%mm1   \n\t"
+    "movq        %%mm3, %%mm4   \n\t"
+    "pand        %%mm6, %%mm0   \n\t"
+    "pand        %%mm6, %%mm3   \n\t"
+    "pmaddwd     %%mm7, %%mm0   \n\t"
+    "pmaddwd     %%mm7, %%mm3   \n\t"
+    "pand        %%mm5, %%mm1   \n\t"
+    "pand        %%mm5, %%mm4   \n\t"
+    "por         %%mm1, %%mm0   \n\t"
+    "por         %%mm4, %%mm3   \n\t"
+    "psrld          $6, %%mm0   \n\t"
+    "pslld         $10, %%mm3   \n\t"
+    "por         %%mm3, %%mm0   \n\t"
+    MOVNTQ"      %%mm0, (%0)    \n\t"
+    "add           $16,  %1     \n\t"
+    "add            $8,  %0     \n\t"
+    "2:                         \n\t"
+    "cmp            %2,  %1     \n\t"
+    " jb            1b          \n\t"
+    : "+r" (d), "+r"(s)
+    : "r" (mm_end), "m" (mask3215g), "m" (mask3216br), "m" (mul3215)
+    );
 #else
-	__asm __volatile(PREFETCH"	%0"::"m"(*src):"memory");
-	__asm __volatile(
-	    "movq	%0, %%mm7\n\t"
-	    "movq	%1, %%mm6\n\t"
-	    ::"m"(red_15mask),"m"(green_15mask));
-	while(s < mm_end)
-	{
-	    __asm __volatile(
-		PREFETCH" 32%1\n\t"
-		"movd	%1, %%mm0\n\t"
-		"movd	4%1, %%mm3\n\t"
-		"punpckldq 8%1, %%mm0\n\t"
-		"punpckldq 12%1, %%mm3\n\t"
-		"movq	%%mm0, %%mm1\n\t"
-		"movq	%%mm0, %%mm2\n\t"
-		"movq	%%mm3, %%mm4\n\t"
-		"movq	%%mm3, %%mm5\n\t"
-		"psrlq	$3, %%mm0\n\t"
-		"psrlq	$3, %%mm3\n\t"
-		"pand	%2, %%mm0\n\t"
-		"pand	%2, %%mm3\n\t"
-		"psrlq	$6, %%mm1\n\t"
-		"psrlq	$6, %%mm4\n\t"
-		"pand	%%mm6, %%mm1\n\t"
-		"pand	%%mm6, %%mm4\n\t"
-		"psrlq	$9, %%mm2\n\t"
-		"psrlq	$9, %%mm5\n\t"
-		"pand	%%mm7, %%mm2\n\t"
-		"pand	%%mm7, %%mm5\n\t"
-		"por	%%mm1, %%mm0\n\t"
-		"por	%%mm4, %%mm3\n\t"
-		"por	%%mm2, %%mm0\n\t"
-		"por	%%mm5, %%mm3\n\t"
-		"psllq	$16, %%mm3\n\t"
-		"por	%%mm3, %%mm0\n\t"
-		MOVNTQ"	%%mm0, %0\n\t"
-		:"=m"(*d):"m"(*s),"m"(blue_15mask):"memory");
-		d += 4;
-		s += 16;
-	}
-#endif
-	__asm __volatile(SFENCE:::"memory");
-	__asm __volatile(EMMS:::"memory");
-#endif
-	while(s < end)
-	{
-		register int rgb = *(uint32_t*)s; s += 4;
-		*d++ = ((rgb&0xFF)>>3) + ((rgb&0xF800)>>6) + ((rgb&0xF80000)>>9);
-	}
+    __asm __volatile(PREFETCH"    %0"::"m"(*src):"memory");
+    __asm __volatile(
+        "movq          %0, %%mm7    \n\t"
+        "movq          %1, %%mm6    \n\t"
+        ::"m"(red_15mask),"m"(green_15mask));
+    while (s < mm_end)
+    {
+        __asm __volatile(
+        PREFETCH"    32%1           \n\t"
+        "movd          %1, %%mm0    \n\t"
+        "movd         4%1, %%mm3    \n\t"
+        "punpckldq    8%1, %%mm0    \n\t"
+        "punpckldq   12%1, %%mm3    \n\t"
+        "movq       %%mm0, %%mm1    \n\t"
+        "movq       %%mm0, %%mm2    \n\t"
+        "movq       %%mm3, %%mm4    \n\t"
+        "movq       %%mm3, %%mm5    \n\t"
+        "psrlq         $3, %%mm0    \n\t"
+        "psrlq         $3, %%mm3    \n\t"
+        "pand          %2, %%mm0    \n\t"
+        "pand          %2, %%mm3    \n\t"
+        "psrlq         $6, %%mm1    \n\t"
+        "psrlq         $6, %%mm4    \n\t"
+        "pand       %%mm6, %%mm1    \n\t"
+        "pand       %%mm6, %%mm4    \n\t"
+        "psrlq         $9, %%mm2    \n\t"
+        "psrlq         $9, %%mm5    \n\t"
+        "pand       %%mm7, %%mm2    \n\t"
+        "pand       %%mm7, %%mm5    \n\t"
+        "por        %%mm1, %%mm0    \n\t"
+        "por        %%mm4, %%mm3    \n\t"
+        "por        %%mm2, %%mm0    \n\t"
+        "por        %%mm5, %%mm3    \n\t"
+        "psllq        $16, %%mm3    \n\t"
+        "por        %%mm3, %%mm0    \n\t"
+        MOVNTQ"     %%mm0, %0       \n\t"
+        :"=m"(*d):"m"(*s),"m"(blue_15mask):"memory");
+        d += 4;
+        s += 16;
+    }
+#endif
+    __asm __volatile(SFENCE:::"memory");
+    __asm __volatile(EMMS:::"memory");
+#endif
+    while (s < end)
+    {
+        register int rgb = *(uint32_t*)s; s += 4;
+        *d++ = ((rgb&0xFF)>>3) + ((rgb&0xF800)>>6) + ((rgb&0xF80000)>>9);
+    }
 }
 
 static inline void RENAME(rgb32tobgr15)(const uint8_t *src, uint8_t *dst, long src_size)
 {
-	const uint8_t *s = src;
-	const uint8_t *end;
+    const uint8_t *s = src;
+    const uint8_t *end;
 #ifdef HAVE_MMX
-	const uint8_t *mm_end;
+    const uint8_t *mm_end;
 #endif
-	uint16_t *d = (uint16_t *)dst;
-	end = s + src_size;
+    uint16_t *d = (uint16_t *)dst;
+    end = s + src_size;
 #ifdef HAVE_MMX
-	__asm __volatile(PREFETCH"	%0"::"m"(*src):"memory");
-	__asm __volatile(
-	    "movq	%0, %%mm7\n\t"
-	    "movq	%1, %%mm6\n\t"
-	    ::"m"(red_15mask),"m"(green_15mask));
-	mm_end = end - 15;
-	while(s < mm_end)
-	{
-	    __asm __volatile(
-		PREFETCH" 32%1\n\t"
-		"movd	%1, %%mm0\n\t"
-		"movd	4%1, %%mm3\n\t"
-		"punpckldq 8%1, %%mm0\n\t"
-		"punpckldq 12%1, %%mm3\n\t"
-		"movq	%%mm0, %%mm1\n\t"
-		"movq	%%mm0, %%mm2\n\t"
-		"movq	%%mm3, %%mm4\n\t"
-		"movq	%%mm3, %%mm5\n\t"
-		"psllq	$7, %%mm0\n\t"
-		"psllq	$7, %%mm3\n\t"
-		"pand	%%mm7, %%mm0\n\t"
-		"pand	%%mm7, %%mm3\n\t"
-		"psrlq	$6, %%mm1\n\t"
-		"psrlq	$6, %%mm4\n\t"
-		"pand	%%mm6, %%mm1\n\t"
-		"pand	%%mm6, %%mm4\n\t"
-		"psrlq	$19, %%mm2\n\t"
-		"psrlq	$19, %%mm5\n\t"
-		"pand	%2, %%mm2\n\t"
-		"pand	%2, %%mm5\n\t"
-		"por	%%mm1, %%mm0\n\t"
-		"por	%%mm4, %%mm3\n\t"
-		"por	%%mm2, %%mm0\n\t"
-		"por	%%mm5, %%mm3\n\t"
-		"psllq	$16, %%mm3\n\t"
-		"por	%%mm3, %%mm0\n\t"
-		MOVNTQ"	%%mm0, %0\n\t"
-		:"=m"(*d):"m"(*s),"m"(blue_15mask):"memory");
-		d += 4;
-		s += 16;
-	}
-	__asm __volatile(SFENCE:::"memory");
-	__asm __volatile(EMMS:::"memory");
-#endif
-	while(s < end)
-	{
-		register int rgb = *(uint32_t*)s; s += 4;
-		*d++ = ((rgb&0xF8)<<7) + ((rgb&0xF800)>>6) + ((rgb&0xF80000)>>19);
-	}
+    __asm __volatile(PREFETCH"    %0"::"m"(*src):"memory");
+    __asm __volatile(
+        "movq          %0, %%mm7    \n\t"
+        "movq          %1, %%mm6    \n\t"
+        ::"m"(red_15mask),"m"(green_15mask));
+    mm_end = end - 15;
+    while (s < mm_end)
+    {
+        __asm __volatile(
+        PREFETCH"    32%1           \n\t"
+        "movd          %1, %%mm0    \n\t"
+        "movd         4%1, %%mm3    \n\t"
+        "punpckldq    8%1, %%mm0    \n\t"
+        "punpckldq   12%1, %%mm3    \n\t"
+        "movq       %%mm0, %%mm1    \n\t"
+        "movq       %%mm0, %%mm2    \n\t"
+        "movq       %%mm3, %%mm4    \n\t"
+        "movq       %%mm3, %%mm5    \n\t"
+        "psllq         $7, %%mm0    \n\t"
+        "psllq         $7, %%mm3    \n\t"
+        "pand       %%mm7, %%mm0    \n\t"
+        "pand       %%mm7, %%mm3    \n\t"
+        "psrlq         $6, %%mm1    \n\t"
+        "psrlq         $6, %%mm4    \n\t"
+        "pand       %%mm6, %%mm1    \n\t"
+        "pand       %%mm6, %%mm4    \n\t"
+        "psrlq        $19, %%mm2    \n\t"
+        "psrlq        $19, %%mm5    \n\t"
+        "pand          %2, %%mm2    \n\t"
+        "pand          %2, %%mm5    \n\t"
+        "por        %%mm1, %%mm0    \n\t"
+        "por        %%mm4, %%mm3    \n\t"
+        "por        %%mm2, %%mm0    \n\t"
+        "por        %%mm5, %%mm3    \n\t"
+        "psllq        $16, %%mm3    \n\t"
+        "por        %%mm3, %%mm0    \n\t"
+        MOVNTQ"     %%mm0, %0       \n\t"
+        :"=m"(*d):"m"(*s),"m"(blue_15mask):"memory");
+        d += 4;
+        s += 16;
+    }
+    __asm __volatile(SFENCE:::"m