Merge commit '8d27bf1c'

* commit '8d27bf1c':
  x86: xvid: K&R formatting cosmetics

Conflicts:
	libavcodec/x86/xvididct_sse2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/x86/xvididct_sse2.c

@@ -51,13 +51,13 @@
  * @brief SSE2 IDCT compatible with the Xvid IDCT
  */
 
-#define X8(x)     x,x,x,x,x,x,x,x
+#define X8(x) x, x, x, x, x, x, x, x
 
-DECLARE_ASM_CONST(16, int16_t, tan1)[] = {X8(13036)}; // tan( pi/16)
-DECLARE_ASM_CONST(16, int16_t, tan2)[] = {X8(27146)}; // tan(2pi/16) = sqrt(2)-1
-DECLARE_ASM_CONST(16, int16_t, tan3)[] = {X8(43790)}; // tan(3pi/16)-1
-DECLARE_ASM_CONST(16, int16_t, sqrt2)[]= {X8(23170)}; // 0.5/sqrt(2)
-DECLARE_ASM_CONST(8,  uint8_t, m127)[] = {X8(127)};
+DECLARE_ASM_CONST(16, int16_t, tan1)[]  = { X8(13036) }; // tan( pi/16)
+DECLARE_ASM_CONST(16, int16_t, tan2)[]  = { X8(27146) }; // tan(2pi/16) = sqrt(2)-1
+DECLARE_ASM_CONST(16, int16_t, tan3)[]  = { X8(43790) }; // tan(3pi/16)-1
+DECLARE_ASM_CONST(16, int16_t, sqrt2)[] = { X8(23170) }; // 0.5/sqrt(2)
+DECLARE_ASM_CONST(8,  uint8_t, m127)[]  = { X8(127) };
 
 DECLARE_ASM_CONST(16, int16_t, iTab1)[] = {
     0x4000, 0x539f, 0xc000, 0xac61, 0x4000, 0xdd5d, 0x4000, 0xdd5d,
@@ -174,7 +174,7 @@ DECLARE_ASM_CONST(16, int32_t, walkenIdctRounders)[] = {
     "pmovmskb  %%mm1, "reg1"          \n\t"                   \
     "pmovmskb  %%mm2, "reg2"          \n\t"
 
-///IDCT pass on rows.
+/// IDCT pass on rows.
 #define iMTX_MULT(src, table, rounder, put)            \
     "movdqa        "src", %%xmm3      \n\t"            \
     "movdqa       %%xmm3, %%xmm0      \n\t"            \
@@ -202,7 +202,7 @@ DECLARE_ASM_CONST(16, int32_t, walkenIdctRounders)[] = {
     "movdqa   "MANGLE(tan3)", "TAN3"  \n\t" \
     "movdqa   "MANGLE(tan1)", "TAN1"  \n\t" \
 
-///IDCT pass on columns.
+/// IDCT pass on columns.
 #define iLLM_PASS(dct)                      \
     "movdqa   "TAN3", %%xmm1          \n\t" \
     "movdqa   "TAN1", %%xmm3          \n\t" \
@@ -280,7 +280,7 @@ DECLARE_ASM_CONST(16, int32_t, walkenIdctRounders)[] = {
     "movdqa   "REG4", 4*16("dct")     \n\t" \
     "movdqa   %%xmm7, 7*16("dct")     \n\t"
 
-///IDCT pass on columns, assuming rows 4-7 are zero.
+/// IDCT pass on columns, assuming rows 4-7 are zero.
 #define iLLM_PASS_SPARSE(dct)               \
     "pmulhw   %%xmm4, "TAN3"          \n\t" \
     "paddsw   %%xmm4, "TAN3"          \n\t" \
@@ -343,8 +343,8 @@ DECLARE_ASM_CONST(16, int32_t, walkenIdctRounders)[] = {
 
 av_extern_inline void ff_xvid_idct_sse2(short *block)
 {
-    __asm__ volatile(
-    "movq     "MANGLE(m127)", %%mm0                              \n\t"
+    __asm__ volatile (
+        "movq     "MANGLE (m127) ", %%mm0                              \n\t"
         iMTX_MULT("(%0)",     MANGLE(iTab1), ROUND(MANGLE(walkenIdctRounders)),        PUT_EVEN(ROW0))
         iMTX_MULT("1*16(%0)", MANGLE(iTab2), ROUND("1*16+"MANGLE(walkenIdctRounders)), PUT_ODD(ROW1))
         iMTX_MULT("2*16(%0)", MANGLE(iTab3), ROUND("2*16+"MANGLE(walkenIdctRounders)), PUT_EVEN(ROW2))
@@ -378,16 +378,15 @@ av_extern_inline void ff_xvid_idct_sse2(short *block)
 #endif
         iLLM_PASS("%0")
         "6:                                                          \n\t"
-    : "+r"(block)
+        : "+r" (block)
         : NAMED_CONSTRAINTS_ARRAY(m127,iTab1,walkenIdctRounders,iTab2,iTab3,iTab4,tan3,tan1,tan2,sqrt2)
-    : XMM_CLOBBERS("%xmm0" , "%xmm1" , "%xmm2" , "%xmm3" ,
-                   "%xmm4" , "%xmm5" , "%xmm6" , "%xmm7" ,)
+        : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
+                       "%xmm4", "%xmm5", "%xmm6", "%xmm7", )
 #if ARCH_X86_64
-      XMM_CLOBBERS("%xmm8" , "%xmm9" , "%xmm10", "%xmm11",
-                   "%xmm12", "%xmm13", "%xmm14",)
+          XMM_CLOBBERS("%xmm8", "%xmm9", "%xmm10", "%xmm11",
+                       "%xmm12", "%xmm13", "%xmm14", )
 #endif
-      "%eax", "%ecx", "%edx", "%esi", "memory"
-    );
+          "%eax", "%ecx", "%edx", "%esi", "memory");
 }
 
 void ff_xvid_idct_sse2_put(uint8_t *dest, int line_size, short *block)