x86: h264dsp: K&R formatting cosmetics

1 files changed, 247 insertions, 225 deletions

diff --git a/libavcodec/x86/h264dsp_mmx.c b/libavcodec/x86/h264dsp_mmx.c
index 16de15e66f..5e02a46236 100644
--- a/libavcodec/x86/h264dsp_mmx.c
+++ b/libavcodec/x86/h264dsp_mmx.c
@@ -25,8 +25,10 @@
 
 /***********************************/
 /* IDCT */
-#define IDCT_ADD_FUNC(NUM, DEPTH, OPT) \
-void ff_h264_idct ## NUM ## _add_ ## DEPTH ## _ ## OPT (uint8_t *dst, int16_t *block, int stride);
+#define IDCT_ADD_FUNC(NUM, DEPTH, OPT)                                  \
+void ff_h264_idct ## NUM ## _add_ ## DEPTH ## _ ## OPT(uint8_t *dst,    \
+                                                       int16_t *block,  \
+                                                       int stride);
 
 IDCT_ADD_FUNC(, 8, mmx)
 IDCT_ADD_FUNC(, 10, sse2)
@@ -44,10 +46,10 @@ IDCT_ADD_FUNC(8, 10, avx)
 #endif
 
 
-#define IDCT_ADD_REP_FUNC(NUM, REP, DEPTH, OPT) \
-void ff_h264_idct ## NUM ## _add ## REP ## _ ## DEPTH ## _ ## OPT \
-                              (uint8_t *dst, const int *block_offset, \
-                              DCTELEM *block, int stride, const uint8_t nnzc[6*8]);
+#define IDCT_ADD_REP_FUNC(NUM, REP, DEPTH, OPT)                         \
+void ff_h264_idct ## NUM ## _add ## REP ## _ ## DEPTH ## _ ## OPT       \
+    (uint8_t *dst, const int *block_offset,                             \
+     DCTELEM *block, int stride, const uint8_t nnzc[6 * 8]);
 
 IDCT_ADD_REP_FUNC(8, 4, 8, mmx)
 IDCT_ADD_REP_FUNC(8, 4, 8, mmx2)
@@ -68,10 +70,11 @@ IDCT_ADD_REP_FUNC(, 16intra, 10, avx)
 #endif
 
 
-#define IDCT_ADD_REP_FUNC2(NUM, REP, DEPTH, OPT) \
-void ff_h264_idct ## NUM ## _add ## REP ## _ ## DEPTH ## _ ## OPT \
-                              (uint8_t **dst, const int *block_offset, \
-                              DCTELEM *block, int stride, const uint8_t nnzc[6*8]);
+#define IDCT_ADD_REP_FUNC2(NUM, REP, DEPTH, OPT)                      \
+void ff_h264_idct ## NUM ## _add ## REP ## _ ## DEPTH ## _ ## OPT     \
+    (uint8_t **dst, const int *block_offset,                          \
+     DCTELEM *block, int stride, const uint8_t nnzc[6 * 8]);
+
 IDCT_ADD_REP_FUNC2(, 8, 8, mmx)
 IDCT_ADD_REP_FUNC2(, 8, 8, mmx2)
 IDCT_ADD_REP_FUNC2(, 8, 8, sse2)
@@ -80,7 +83,7 @@ IDCT_ADD_REP_FUNC2(, 8, 10, sse2)
 IDCT_ADD_REP_FUNC2(, 8, 10, avx)
 #endif
 
-void ff_h264_luma_dc_dequant_idct_mmx (DCTELEM *output, DCTELEM *input, int qmul);
+void ff_h264_luma_dc_dequant_idct_mmx(DCTELEM *output, DCTELEM *input, int qmul);
 void ff_h264_luma_dc_dequant_idct_sse2(DCTELEM *output, DCTELEM *input, int qmul);
 
 /***********************************/
@@ -91,273 +94,292 @@ void ff_h264_loop_filter_strength_mmx2(int16_t bS[2][4][4], uint8_t nnz[40],
                                        int bidir, int edges, int step,
                                        int mask_mv0, int mask_mv1, int field);
 
-#define LF_FUNC(DIR, TYPE, DEPTH, OPT) \
-void ff_deblock_ ## DIR ## _ ## TYPE ## _ ## DEPTH ## _ ## OPT (uint8_t *pix, int stride, \
-                                                                int alpha, int beta, int8_t *tc0);
+#define LF_FUNC(DIR, TYPE, DEPTH, OPT)                                        \
+void ff_deblock_ ## DIR ## _ ## TYPE ## _ ## DEPTH ## _ ## OPT(uint8_t *pix,  \
+                                                               int stride,    \
+                                                               int alpha,     \
+                                                               int beta,      \
+                                                               int8_t *tc0);
 #define LF_IFUNC(DIR, TYPE, DEPTH, OPT) \
-void ff_deblock_ ## DIR ## _ ## TYPE ## _ ## DEPTH ## _ ## OPT (uint8_t *pix, int stride, \
-                                                                int alpha, int beta);
-
-#define LF_FUNCS(type, depth)\
-LF_FUNC (h,  chroma,       depth, mmx2)\
-LF_IFUNC(h,  chroma_intra, depth, mmx2)\
-LF_FUNC (v,  chroma,       depth, mmx2)\
-LF_IFUNC(v,  chroma_intra, depth, mmx2)\
-LF_FUNC (h,  luma,         depth, mmx2)\
-LF_IFUNC(h,  luma_intra,   depth, mmx2)\
-LF_FUNC (h,  luma,         depth, sse2)\
-LF_IFUNC(h,  luma_intra,   depth, sse2)\
-LF_FUNC (v,  luma,         depth, sse2)\
-LF_IFUNC(v,  luma_intra,   depth, sse2)\
-LF_FUNC (h,  chroma,       depth, sse2)\
-LF_IFUNC(h,  chroma_intra, depth, sse2)\
-LF_FUNC (v,  chroma,       depth, sse2)\
-LF_IFUNC(v,  chroma_intra, depth, sse2)\
-LF_FUNC (h,  luma,         depth,  avx)\
-LF_IFUNC(h,  luma_intra,   depth,  avx)\
-LF_FUNC (v,  luma,         depth,  avx)\
-LF_IFUNC(v,  luma_intra,   depth,  avx)\
-LF_FUNC (h,  chroma,       depth,  avx)\
-LF_IFUNC(h,  chroma_intra, depth,  avx)\
-LF_FUNC (v,  chroma,       depth,  avx)\
-LF_IFUNC(v,  chroma_intra, depth,  avx)
-
-LF_FUNCS( uint8_t,  8)
+void ff_deblock_ ## DIR ## _ ## TYPE ## _ ## DEPTH ## _ ## OPT(uint8_t *pix,  \
+                                                               int stride,    \
+                                                               int alpha,     \
+                                                               int beta);
+
+#define LF_FUNCS(type, depth)                   \
+LF_FUNC(h,  chroma,       depth, mmx2)          \
+LF_IFUNC(h, chroma_intra, depth, mmx2)          \
+LF_FUNC(v,  chroma,       depth, mmx2)          \
+LF_IFUNC(v, chroma_intra, depth, mmx2)          \
+LF_FUNC(h,  luma,         depth, mmx2)          \
+LF_IFUNC(h, luma_intra,   depth, mmx2)          \
+LF_FUNC(h,  luma,         depth, sse2)          \
+LF_IFUNC(h, luma_intra,   depth, sse2)          \
+LF_FUNC(v,  luma,         depth, sse2)          \
+LF_IFUNC(v, luma_intra,   depth, sse2)          \
+LF_FUNC(h,  chroma,       depth, sse2)          \
+LF_IFUNC(h, chroma_intra, depth, sse2)          \
+LF_FUNC(v,  chroma,       depth, sse2)          \
+LF_IFUNC(v, chroma_intra, depth, sse2)          \
+LF_FUNC(h,  luma,         depth, avx)           \
+LF_IFUNC(h, luma_intra,   depth, avx)           \
+LF_FUNC(v,  luma,         depth, avx)           \
+LF_IFUNC(v, luma_intra,   depth, avx)           \
+LF_FUNC(h,  chroma,       depth, avx)           \
+LF_IFUNC(h, chroma_intra, depth, avx)           \
+LF_FUNC(v,  chroma,       depth, avx)           \
+LF_IFUNC(v, chroma_intra, depth, avx)
+
+LF_FUNCS(uint8_t,   8)
 LF_FUNCS(uint16_t, 10)
 
 #if ARCH_X86_32
-LF_FUNC (v8, luma,             8, mmx2)
-static void ff_deblock_v_luma_8_mmx2(uint8_t *pix, int stride, int alpha, int beta, int8_t *tc0)
+LF_FUNC(v8, luma, 8, mmx2)
+static void ff_deblock_v_luma_8_mmx2(uint8_t *pix, int stride, int alpha,
+                                     int beta, int8_t *tc0)
 {
-    if((tc0[0] & tc0[1]) >= 0)
-        ff_deblock_v8_luma_8_mmx2(pix+0, stride, alpha, beta, tc0);
-    if((tc0[2] & tc0[3]) >= 0)
-        ff_deblock_v8_luma_8_mmx2(pix+8, stride, alpha, beta, tc0+2);
+    if ((tc0[0] & tc0[1]) >= 0)
+        ff_deblock_v8_luma_8_mmx2(pix + 0, stride, alpha, beta, tc0);
+    if ((tc0[2] & tc0[3]) >= 0)
+        ff_deblock_v8_luma_8_mmx2(pix + 8, stride, alpha, beta, tc0 + 2);
 }
-LF_IFUNC(v8, luma_intra,        8, mmx2)
-static void ff_deblock_v_luma_intra_8_mmx2(uint8_t *pix, int stride, int alpha, int beta)
+
+LF_IFUNC(v8, luma_intra, 8, mmx2)
+static void ff_deblock_v_luma_intra_8_mmx2(uint8_t *pix, int stride,
+                                           int alpha, int beta)
 {
-    ff_deblock_v8_luma_intra_8_mmx2(pix+0, stride, alpha, beta);
-    ff_deblock_v8_luma_intra_8_mmx2(pix+8, stride, alpha, beta);
+    ff_deblock_v8_luma_intra_8_mmx2(pix + 0, stride, alpha, beta);
+    ff_deblock_v8_luma_intra_8_mmx2(pix + 8, stride, alpha, beta);
 }
 #endif /* ARCH_X86_32 */
 
-LF_FUNC (v,  luma,            10, mmx2)
-LF_IFUNC(v,  luma_intra,      10, mmx2)
+LF_FUNC(v,  luma,       10, mmx2)
+LF_IFUNC(v, luma_intra, 10, mmx2)
 
 /***********************************/
 /* weighted prediction */
 
-#define H264_WEIGHT(W, OPT) \
-void ff_h264_weight_ ## W ## _ ## OPT(uint8_t *dst, \
-    int stride, int height, int log2_denom, int weight, int offset);
+#define H264_WEIGHT(W, OPT)                                             \
+void ff_h264_weight_ ## W ## _ ## OPT(uint8_t *dst, int stride,         \
+                                      int height, int log2_denom,       \
+                                      int weight, int offset);
 
-#define H264_BIWEIGHT(W, OPT) \
-void ff_h264_biweight_ ## W ## _ ## OPT(uint8_t *dst, \
-    uint8_t *src, int stride, int height, int log2_denom, int weightd, \
-    int weights, int offset);
+#define H264_BIWEIGHT(W, OPT)                                           \
+void ff_h264_biweight_ ## W ## _ ## OPT(uint8_t *dst, uint8_t *src,     \
+                                        int stride, int height,         \
+                                        int log2_denom, int weightd,    \
+                                        int weights, int offset);
 
-#define H264_BIWEIGHT_MMX(W) \
-H264_WEIGHT  (W, mmx2) \
-H264_BIWEIGHT(W, mmx2)
+#define H264_BIWEIGHT_MMX(W)                    \
+    H264_WEIGHT(W, mmx2)                        \
+    H264_BIWEIGHT(W, mmx2)
 
-#define H264_BIWEIGHT_MMX_SSE(W) \
-H264_BIWEIGHT_MMX(W) \
-H264_WEIGHT      (W, sse2) \
-H264_BIWEIGHT    (W, sse2) \
-H264_BIWEIGHT    (W, ssse3)
+#define H264_BIWEIGHT_MMX_SSE(W)                \
+    H264_BIWEIGHT_MMX(W)                        \
+    H264_WEIGHT(W, sse2)                        \
+    H264_BIWEIGHT(W, sse2)                      \
+    H264_BIWEIGHT(W, ssse3)
 
 H264_BIWEIGHT_MMX_SSE(16)
-H264_BIWEIGHT_MMX_SSE( 8)
-H264_BIWEIGHT_MMX    ( 4)
-
-#define H264_WEIGHT_10(W, DEPTH, OPT) \
-void ff_h264_weight_ ## W ## _ ## DEPTH ## _ ## OPT(uint8_t *dst, \
-    int stride, int height, int log2_denom, int weight, int offset);
-
-#define H264_BIWEIGHT_10(W, DEPTH, OPT) \
-void ff_h264_biweight_ ## W ## _ ## DEPTH ## _ ## OPT \
-    (uint8_t *dst, uint8_t *src, int stride, int height, int log2_denom, \
-     int weightd, int weights, int offset);
-
-#define H264_BIWEIGHT_10_SSE(W, DEPTH) \
-H264_WEIGHT_10  (W, DEPTH, sse2) \
-H264_WEIGHT_10  (W, DEPTH, sse4) \
-H264_BIWEIGHT_10(W, DEPTH, sse2) \
-H264_BIWEIGHT_10(W, DEPTH, sse4)
+H264_BIWEIGHT_MMX_SSE(8)
+H264_BIWEIGHT_MMX(4)
+
+#define H264_WEIGHT_10(W, DEPTH, OPT)                                   \
+void ff_h264_weight_ ## W ## _ ## DEPTH ## _ ## OPT(uint8_t *dst,       \
+                                                    int stride,         \
+                                                    int height,         \
+                                                    int log2_denom,     \
+                                                    int weight,         \
+                                                    int offset);
+
+#define H264_BIWEIGHT_10(W, DEPTH, OPT)                                 \
+void ff_h264_biweight_ ## W ## _ ## DEPTH ## _ ## OPT(uint8_t *dst,     \
+                                                      uint8_t *src,     \
+                                                      int stride,       \
+                                                      int height,       \
+                                                      int log2_denom,   \
+                                                      int weightd,      \
+                                                      int weights,      \
+                                                      int offset);
+
+#define H264_BIWEIGHT_10_SSE(W, DEPTH)          \
+    H264_WEIGHT_10(W, DEPTH, sse2)              \
+    H264_WEIGHT_10(W, DEPTH, sse4)              \
+    H264_BIWEIGHT_10(W, DEPTH, sse2)            \
+    H264_BIWEIGHT_10(W, DEPTH, sse4)
 
 H264_BIWEIGHT_10_SSE(16, 10)
-H264_BIWEIGHT_10_SSE( 8, 10)
-H264_BIWEIGHT_10_SSE( 4, 10)
+H264_BIWEIGHT_10_SSE(8,  10)
+H264_BIWEIGHT_10_SSE(4,  10)
 
-void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
+void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth,
+                         const int chroma_format_idc)
 {
 #if HAVE_YASM
     int mm_flags = av_get_cpu_flags();
 
-    if (chroma_format_idc == 1 && mm_flags & AV_CPU_FLAG_MMX2) {
+    if (chroma_format_idc == 1 && mm_flags & AV_CPU_FLAG_MMX2)
         c->h264_loop_filter_strength = ff_h264_loop_filter_strength_mmx2;
-    }
 
     if (bit_depth == 8) {
-    if (mm_flags & AV_CPU_FLAG_MMX) {
-        c->h264_idct_dc_add         =
-        c->h264_idct_add            = ff_h264_idct_add_8_mmx;
-        c->h264_idct8_dc_add        =
-        c->h264_idct8_add           = ff_h264_idct8_add_8_mmx;
-
-        c->h264_idct_add16          = ff_h264_idct_add16_8_mmx;
-        c->h264_idct8_add4          = ff_h264_idct8_add4_8_mmx;
-        if (chroma_format_idc == 1)
-            c->h264_idct_add8       = ff_h264_idct_add8_8_mmx;
-        c->h264_idct_add16intra     = ff_h264_idct_add16intra_8_mmx;
-        if (mm_flags & AV_CPU_FLAG_CMOV)
-            c->h264_luma_dc_dequant_idct = ff_h264_luma_dc_dequant_idct_mmx;
-
-        if (mm_flags & AV_CPU_FLAG_MMX2) {
-            c->h264_idct_dc_add    = ff_h264_idct_dc_add_8_mmx2;
-            c->h264_idct8_dc_add   = ff_h264_idct8_dc_add_8_mmx2;
-            c->h264_idct_add16     = ff_h264_idct_add16_8_mmx2;
-            c->h264_idct8_add4     = ff_h264_idct8_add4_8_mmx2;
+        if (mm_flags & AV_CPU_FLAG_MMX) {
+            c->h264_idct_dc_add   =
+            c->h264_idct_add      = ff_h264_idct_add_8_mmx;
+            c->h264_idct8_dc_add  =
+            c->h264_idct8_add     = ff_h264_idct8_add_8_mmx;
+
+            c->h264_idct_add16 = ff_h264_idct_add16_8_mmx;
+            c->h264_idct8_add4 = ff_h264_idct8_add4_8_mmx;
             if (chroma_format_idc == 1)
-                c->h264_idct_add8  = ff_h264_idct_add8_8_mmx2;
-            c->h264_idct_add16intra= ff_h264_idct_add16intra_8_mmx2;
-
-            c->h264_v_loop_filter_chroma= ff_deblock_v_chroma_8_mmx2;
-            c->h264_v_loop_filter_chroma_intra= ff_deblock_v_chroma_intra_8_mmx2;
-            if (chroma_format_idc == 1) {
-                c->h264_h_loop_filter_chroma= ff_deblock_h_chroma_8_mmx2;
-                c->h264_h_loop_filter_chroma_intra= ff_deblock_h_chroma_intra_8_mmx2;
-            }
+                c->h264_idct_add8 = ff_h264_idct_add8_8_mmx;
+            c->h264_idct_add16intra = ff_h264_idct_add16intra_8_mmx;
+            if (mm_flags & AV_CPU_FLAG_CMOV)
+                c->h264_luma_dc_dequant_idct = ff_h264_luma_dc_dequant_idct_mmx;
+
+            if (mm_flags & AV_CPU_FLAG_MMX2) {
+                c->h264_idct_dc_add  = ff_h264_idct_dc_add_8_mmx2;
+                c->h264_idct8_dc_add = ff_h264_idct8_dc_add_8_mmx2;
+                c->h264_idct_add16   = ff_h264_idct_add16_8_mmx2;
+                c->h264_idct8_add4   = ff_h264_idct8_add4_8_mmx2;
+                if (chroma_format_idc == 1)
+                    c->h264_idct_add8 = ff_h264_idct_add8_8_mmx2;
+                c->h264_idct_add16intra = ff_h264_idct_add16intra_8_mmx2;
+
+                c->h264_v_loop_filter_chroma       = ff_deblock_v_chroma_8_mmx2;
+                c->h264_v_loop_filter_chroma_intra = ff_deblock_v_chroma_intra_8_mmx2;
+                if (chroma_format_idc == 1) {
+                    c->h264_h_loop_filter_chroma       = ff_deblock_h_chroma_8_mmx2;
+                    c->h264_h_loop_filter_chroma_intra = ff_deblock_h_chroma_intra_8_mmx2;
+                }
 #if ARCH_X86_32
-            c->h264_v_loop_filter_luma= ff_deblock_v_luma_8_mmx2;
-            c->h264_h_loop_filter_luma= ff_deblock_h_luma_8_mmx2;
-            c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_8_mmx2;
-            c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_8_mmx2;
-#endif
-            c->weight_h264_pixels_tab[0]= ff_h264_weight_16_mmx2;
-            c->weight_h264_pixels_tab[1]= ff_h264_weight_8_mmx2;
-            c->weight_h264_pixels_tab[2]= ff_h264_weight_4_mmx2;
+                c->h264_v_loop_filter_luma       = ff_deblock_v_luma_8_mmx2;
+                c->h264_h_loop_filter_luma       = ff_deblock_h_luma_8_mmx2;
+                c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_8_mmx2;
+                c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_8_mmx2;
+#endif /* ARCH_X86_32 */
+                c->weight_h264_pixels_tab[0] = ff_h264_weight_16_mmx2;
+                c->weight_h264_pixels_tab[1] = ff_h264_weight_8_mmx2;
+                c->weight_h264_pixels_tab[2] = ff_h264_weight_4_mmx2;
 
-            c->biweight_h264_pixels_tab[0]= ff_h264_biweight_16_mmx2;
-            c->biweight_h264_pixels_tab[1]= ff_h264_biweight_8_mmx2;
-            c->biweight_h264_pixels_tab[2]= ff_h264_biweight_4_mmx2;
+                c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_mmx2;
+                c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_mmx2;
+                c->biweight_h264_pixels_tab[2] = ff_h264_biweight_4_mmx2;
 
-            if (mm_flags&AV_CPU_FLAG_SSE2) {
-                c->h264_idct8_add           = ff_h264_idct8_add_8_sse2;
+                if (mm_flags & AV_CPU_FLAG_SSE2) {
+                    c->h264_idct8_add  = ff_h264_idct8_add_8_sse2;
 
-                c->h264_idct_add16          = ff_h264_idct_add16_8_sse2;
-                c->h264_idct8_add4          = ff_h264_idct8_add4_8_sse2;
-                if (chroma_format_idc == 1)
-                    c->h264_idct_add8       = ff_h264_idct_add8_8_sse2;
-                c->h264_idct_add16intra     = ff_h264_idct_add16intra_8_sse2;
-                c->h264_luma_dc_dequant_idct= ff_h264_luma_dc_dequant_idct_sse2;
+                    c->h264_idct_add16 = ff_h264_idct_add16_8_sse2;
+                    c->h264_idct8_add4 = ff_h264_idct8_add4_8_sse2;
+                    if (chroma_format_idc == 1)
+                        c->h264_idct_add8 = ff_h264_idct_add8_8_sse2;
+                    c->h264_idct_add16intra      = ff_h264_idct_add16intra_8_sse2;
+                    c->h264_luma_dc_dequant_idct = ff_h264_luma_dc_dequant_idct_sse2;
 
-                c->weight_h264_pixels_tab[0]= ff_h264_weight_16_sse2;
-                c->weight_h264_pixels_tab[1]= ff_h264_weight_8_sse2;
+                    c->weight_h264_pixels_tab[0] = ff_h264_weight_16_sse2;
+                    c->weight_h264_pixels_tab[1] = ff_h264_weight_8_sse2;
 
-                c->biweight_h264_pixels_tab[0]= ff_h264_biweight_16_sse2;
-                c->biweight_h264_pixels_tab[1]= ff_h264_biweight_8_sse2;
+                    c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_sse2;
+                    c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_sse2;
 
 #if HAVE_ALIGNED_STACK
-                c->h264_v_loop_filter_luma = ff_deblock_v_luma_8_sse2;
-                c->h264_h_loop_filter_luma = ff_deblock_h_luma_8_sse2;
-                c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_8_sse2;
-                c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_8_sse2;
-#endif
-            }
-            if (mm_flags&AV_CPU_FLAG_SSSE3) {
-                c->biweight_h264_pixels_tab[0]= ff_h264_biweight_16_ssse3;
-                c->biweight_h264_pixels_tab[1]= ff_h264_biweight_8_ssse3;
-            }
-            if (mm_flags&AV_CPU_FLAG_AVX) {
+                    c->h264_v_loop_filter_luma       = ff_deblock_v_luma_8_sse2;
+                    c->h264_h_loop_filter_luma       = ff_deblock_h_luma_8_sse2;
+                    c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_8_sse2;
+                    c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_8_sse2;
+#endif /* HAVE_ALIGNED_STACK */
+                }
+                if (mm_flags & AV_CPU_FLAG_SSSE3) {
+                    c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_ssse3;
+                    c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_ssse3;
+                }
+                if (mm_flags & AV_CPU_FLAG_AVX) {
 #if HAVE_ALIGNED_STACK
-                c->h264_v_loop_filter_luma = ff_deblock_v_luma_8_avx;
-                c->h264_h_loop_filter_luma = ff_deblock_h_luma_8_avx;
-                c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_8_avx;
-                c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_8_avx;
-#endif
+                    c->h264_v_loop_filter_luma       = ff_deblock_v_luma_8_avx;
+                    c->h264_h_loop_filter_luma       = ff_deblock_h_luma_8_avx;
+                    c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_8_avx;
+                    c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_8_avx;
+#endif /* HAVE_ALIGNED_STACK */
+                }
             }
         }
-    }
     } else if (bit_depth == 10) {
-    if (mm_flags & AV_CPU_FLAG_MMX) {
-        if (mm_flags & AV_CPU_FLAG_MMX2) {
+        if (mm_flags & AV_CPU_FLAG_MMX) {
+            if (mm_flags & AV_CPU_FLAG_MMX2) {
 #if ARCH_X86_32
-            c->h264_v_loop_filter_chroma= ff_deblock_v_chroma_10_mmx2;
-            c->h264_v_loop_filter_chroma_intra= ff_deblock_v_chroma_intra_10_mmx2;
-            c->h264_v_loop_filter_luma= ff_deblock_v_luma_10_mmx2;
-            c->h264_h_loop_filter_luma= ff_deblock_h_luma_10_mmx2;
-            c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_10_mmx2;
-            c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_10_mmx2;
-#endif
-            c->h264_idct_dc_add= ff_h264_idct_dc_add_10_mmx2;
-            if (mm_flags&AV_CPU_FLAG_SSE2) {
-                c->h264_idct_add       = ff_h264_idct_add_10_sse2;
-                c->h264_idct8_dc_add   = ff_h264_idct8_dc_add_10_sse2;
-
-                c->h264_idct_add16     = ff_h264_idct_add16_10_sse2;
-                if (chroma_format_idc == 1)
-                    c->h264_idct_add8  = ff_h264_idct_add8_10_sse2;
-                c->h264_idct_add16intra= ff_h264_idct_add16intra_10_sse2;
+                c->h264_v_loop_filter_chroma       = ff_deblock_v_chroma_10_mmx2;
+                c->h264_v_loop_filter_chroma_intra = ff_deblock_v_chroma_intra_10_mmx2;
+                c->h264_v_loop_filter_luma         = ff_deblock_v_luma_10_mmx2;
+                c->h264_h_loop_filter_luma         = ff_deblock_h_luma_10_mmx2;
+                c->h264_v_loop_filter_luma_intra   = ff_deblock_v_luma_intra_10_mmx2;
+                c->h264_h_loop_filter_luma_intra   = ff_deblock_h_luma_intra_10_mmx2;
+#endif /* ARCH_X86_32 */
+                c->h264_idct_dc_add = ff_h264_idct_dc_add_10_mmx2;
+                if (mm_flags & AV_CPU_FLAG_SSE2) {
+                    c->h264_idct_add     = ff_h264_idct_add_10_sse2;
+                    c->h264_idct8_dc_add = ff_h264_idct8_dc_add_10_sse2;
+
+                    c->h264_idct_add16 = ff_h264_idct_add16_10_sse2;
+                    if (chroma_format_idc == 1)
+                        c->h264_idct_add8 = ff_h264_idct_add8_10_sse2;
+                    c->h264_idct_add16intra = ff_h264_idct_add16intra_10_sse2;
 #if HAVE_ALIGNED_STACK
-                c->h264_idct8_add      = ff_h264_idct8_add_10_sse2;
-                c->h264_idct8_add4     = ff_h264_idct8_add4_10_sse2;
-#endif
+                    c->h264_idct8_add  = ff_h264_idct8_add_10_sse2;
+                    c->h264_idct8_add4 = ff_h264_idct8_add4_10_sse2;
+#endif /* HAVE_ALIGNED_STACK */
 
-                c->weight_h264_pixels_tab[0] = ff_h264_weight_16_10_sse2;
-                c->weight_h264_pixels_tab[1] = ff_h264_weight_8_10_sse2;
-                c->weight_h264_pixels_tab[2] = ff_h264_weight_4_10_sse2;
+                    c->weight_h264_pixels_tab[0] = ff_h264_weight_16_10_sse2;
+                    c->weight_h264_pixels_tab[1] = ff_h264_weight_8_10_sse2;
+                    c->weight_h264_pixels_tab[2] = ff_h264_weight_4_10_sse2;
 
-                c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_10_sse2;
-                c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_10_sse2;
-                c->biweight_h264_pixels_tab[2] = ff_h264_biweight_4_10_sse2;
+                    c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_10_sse2;
+                    c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_10_sse2;
+                    c->biweight_h264_pixels_tab[2] = ff_h264_biweight_4_10_sse2;
 
-                c->h264_v_loop_filter_chroma= ff_deblock_v_chroma_10_sse2;
-                c->h264_v_loop_filter_chroma_intra= ff_deblock_v_chroma_intra_10_sse2;
+                    c->h264_v_loop_filter_chroma       = ff_deblock_v_chroma_10_sse2;
+                    c->h264_v_loop_filter_chroma_intra = ff_deblock_v_chroma_intra_10_sse2;
 #if HAVE_ALIGNED_STACK
-                c->h264_v_loop_filter_luma = ff_deblock_v_luma_10_sse2;
-                c->h264_h_loop_filter_luma = ff_deblock_h_luma_10_sse2;
-                c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_10_sse2;
-                c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_10_sse2;
-#endif
-            }
-            if (mm_flags&AV_CPU_FLAG_SSE4) {
-                c->weight_h264_pixels_tab[0] = ff_h264_weight_16_10_sse4;
-                c->weight_h264_pixels_tab[1] = ff_h264_weight_8_10_sse4;
-                c->weight_h264_pixels_tab[2] = ff_h264_weight_4_10_sse4;
-
-                c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_10_sse4;
-                c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_10_sse4;
-                c->biweight_h264_pixels_tab[2] = ff_h264_biweight_4_10_sse4;
-            }
+                    c->h264_v_loop_filter_luma       = ff_deblock_v_luma_10_sse2;
+                    c->h264_h_loop_filter_luma       = ff_deblock_h_luma_10_sse2;
+                    c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_10_sse2;
+                    c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_10_sse2;
+#endif /* HAVE_ALIGNED_STACK */
+                }
+                if (mm_flags & AV_CPU_FLAG_SSE4) {
+                    c->weight_h264_pixels_tab[0] = ff_h264_weight_16_10_sse4;
+                    c->weight_h264_pixels_tab[1] = ff_h264_weight_8_10_sse4;
+                    c->weight_h264_pixels_tab[2] = ff_h264_weight_4_10_sse4;
+
+                    c->biweight_h264_pixels_tab[0] = ff_h264_biweight_16_10_sse4;
+                    c->biweight_h264_pixels_tab[1] = ff_h264_biweight_8_10_sse4;
+                    c->biweight_h264_pixels_tab[2] = ff_h264_biweight_4_10_sse4;
+                }
 #if HAVE_AVX
-            if (mm_flags&AV_CPU_FLAG_AVX) {
-                c->h264_idct_dc_add    =
-                c->h264_idct_add       = ff_h264_idct_add_10_avx;
-                c->h264_idct8_dc_add   = ff_h264_idct8_dc_add_10_avx;
-
-                c->h264_idct_add16     = ff_h264_idct_add16_10_avx;
-                if (chroma_format_idc == 1)
-                    c->h264_idct_add8  = ff_h264_idct_add8_10_avx;
-                c->h264_idct_add16intra= ff_h264_idct_add16intra_10_avx;
+                if (mm_flags & AV_CPU_FLAG_AVX) {
+                    c->h264_idct_dc_add  =
+                    c->h264_idct_add     = ff_h264_idct_add_10_avx;
+                    c->h264_idct8_dc_add = ff_h264_idct8_dc_add_10_avx;
+
+                    c->h264_idct_add16 = ff_h264_idct_add16_10_avx;
+                    if (chroma_format_idc == 1)
+                        c->h264_idct_add8 = ff_h264_idct_add8_10_avx;
+                    c->h264_idct_add16intra = ff_h264_idct_add16intra_10_avx;
 #if HAVE_ALIGNED_STACK
-                c->h264_idct8_add      = ff_h264_idct8_add_10_avx;
-                c->h264_idct8_add4     = ff_h264_idct8_add4_10_avx;
-#endif
+                    c->h264_idct8_add  = ff_h264_idct8_add_10_avx;
+                    c->h264_idct8_add4 = ff_h264_idct8_add4_10_avx;
+#endif /* HAVE_ALIGNED_STACK */
 
-                c->h264_v_loop_filter_chroma= ff_deblock_v_chroma_10_avx;
-                c->h264_v_loop_filter_chroma_intra= ff_deblock_v_chroma_intra_10_avx;
+                    c->h264_v_loop_filter_chroma       = ff_deblock_v_chroma_10_avx;
+                    c->h264_v_loop_filter_chroma_intra = ff_deblock_v_chroma_intra_10_avx;
 #if HAVE_ALIGNED_STACK
-                c->h264_v_loop_filter_luma = ff_deblock_v_luma_10_avx;
-                c->h264_h_loop_filter_luma = ff_deblock_h_luma_10_avx;
-                c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_10_avx;
-                c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_10_avx;
-#endif
-            }
+                    c->h264_v_loop_filter_luma         = ff_deblock_v_luma_10_avx;
+                    c->h264_h_loop_filter_luma         = ff_deblock_h_luma_10_avx;
+                    c->h264_v_loop_filter_luma_intra   = ff_deblock_v_luma_intra_10_avx;
+                    c->h264_h_loop_filter_luma_intra   = ff_deblock_h_luma_intra_10_avx;
+#endif /* HAVE_ALIGNED_STACK */
+                }
 #endif /* HAVE_AVX */
+            }
         }
     }
-    }
-#endif
+#endif /* HAVE_YASM */
 }