This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

commit a65ed248fdcd37c08b4a398b5daa9a81674a5073
Author:     Martin Storsjö <[email protected]>
AuthorDate: Fri Apr 10 12:13:35 2026 +0300
Commit:     Martin Storsjö <[email protected]>
CommitDate: Wed Apr 29 13:49:27 2026 +0300

    arm/simple_idct_armv6: Reindent previously consistent assembly to shared 
style
    
    This has manual fixups, as the indenting script wants to
    lowercase constants like W46 to w46, which breaks things.
---
 libavcodec/arm/simple_idct_armv6.S | 530 ++++++++++++++++++-------------------
 1 file changed, 265 insertions(+), 265 deletions(-)

diff --git a/libavcodec/arm/simple_idct_armv6.S 
b/libavcodec/arm/simple_idct_armv6.S
index f95c20d295..63639f9a8e 100644
--- a/libavcodec/arm/simple_idct_armv6.S
+++ b/libavcodec/arm/simple_idct_armv6.S
@@ -51,35 +51,35 @@
   Output in registers r4--r11
 */
         .macro idct_row shift
-        ldr    lr, =W46              /* lr  = W4 | (W6 << 16) */
-        mov    r1, #(1<<(\shift-1))
-        smlad  r4, r2, ip, r1
-        smlsd  r7, r2, ip, r1
-        ldr    ip, =W13              /* ip  = W1 | (W3 << 16) */
-        ldr    r10,=W57              /* r10 = W5 | (W7 << 16) */
-        smlad  r5, r2, lr, r1
-        smlsd  r6, r2, lr, r1
-
-        smuad  r8, r3, ip            /* r8  =  B0 = W1*row[1] + W3*row[3] */
-        smusdx r11,r3, r10           /* r11 =  B3 = W7*row[1] - W5*row[3] */
-        ldr    lr, [r0, #12]         /* lr  =  row[7,5] */
-        pkhtb  r2, ip, r10,asr #16   /* r3  =  W7 | (W3 << 16) */
-        pkhbt  r1, ip, r10,lsl #16   /* r1  =  W1 | (W5 << 16) */
-        smusdx r9, r2, r3            /* r9  = -B1 = W7*row[3] - W3*row[1] */
-        smlad  r8, lr, r10,r8        /* B0  +=      W5*row[5] + W7*row[7] */
-        smusdx r10,r3, r1            /* r10 =  B2 = W5*row[1] - W1*row[3] */
-
-        ldr    r3, =W42n             /* r3 =  -W4 | (-W2 << 16) */
-        smlad  r10,lr, r2, r10       /* B2 +=  W7*row[5] + W3*row[7] */
-        ldr    r2, [r0, #4]          /* r2 =   row[6,4] */
-        smlsdx r11,lr, ip, r11       /* B3 +=  W3*row[5] - W1*row[7] */
-        ldr    ip, =W46              /* ip =   W4 | (W6 << 16) */
-        smlad  r9, lr, r1, r9        /* B1 -=  W1*row[5] + W5*row[7] */
-
-        smlad  r5, r2, r3, r5        /* A1 += -W4*row[4] - W2*row[6] */
-        smlsd  r6, r2, r3, r6        /* A2 += -W4*row[4] + W2*row[6] */
-        smlad  r4, r2, ip, r4        /* A0 +=  W4*row[4] + W6*row[6] */
-        smlsd  r7, r2, ip, r7        /* A3 +=  W4*row[4] - W6*row[6] */
+        ldr             lr, =W46              /* lr  = W4 | (W6 << 16) */
+        mov             r1, #(1<<(\shift-1))
+        smlad           r4, r2, ip, r1
+        smlsd           r7, r2, ip, r1
+        ldr             ip, =W13              /* ip  = W1 | (W3 << 16) */
+        ldr             r10,=W57              /* r10 = W5 | (W7 << 16) */
+        smlad           r5, r2, lr, r1
+        smlsd           r6, r2, lr, r1
+
+        smuad           r8, r3, ip            /* r8  =  B0 = W1*row[1] + 
W3*row[3] */
+        smusdx          r11,r3, r10           /* r11 =  B3 = W7*row[1] - 
W5*row[3] */
+        ldr             lr, [r0, #12]         /* lr  =  row[7,5] */
+        pkhtb           r2, ip, r10,asr #16   /* r3  =  W7 | (W3 << 16) */
+        pkhbt           r1, ip, r10,lsl #16   /* r1  =  W1 | (W5 << 16) */
+        smusdx          r9, r2, r3            /* r9  = -B1 = W7*row[3] - 
W3*row[1] */
+        smlad           r8, lr, r10,r8        /* B0  +=      W5*row[5] + 
W7*row[7] */
+        smusdx          r10,r3, r1            /* r10 =  B2 = W5*row[1] - 
W1*row[3] */
+
+        ldr             r3, =W42n             /* r3 =  -W4 | (-W2 << 16) */
+        smlad           r10,lr, r2, r10       /* B2 +=  W7*row[5] + W3*row[7] 
*/
+        ldr             r2, [r0, #4]          /* r2 =   row[6,4] */
+        smlsdx          r11,lr, ip, r11       /* B3 +=  W3*row[5] - W1*row[7] 
*/
+        ldr             ip, =W46              /* ip =   W4 | (W6 << 16) */
+        smlad           r9, lr, r1, r9        /* B1 -=  W1*row[5] + W5*row[7] 
*/
+
+        smlad           r5, r2, r3, r5        /* A1 += -W4*row[4] - W2*row[6] 
*/
+        smlsd           r6, r2, r3, r6        /* A2 += -W4*row[4] + W2*row[6] 
*/
+        smlad           r4, r2, ip, r4        /* A0 +=  W4*row[4] + W6*row[6] 
*/
+        smlsd           r7, r2, ip, r7        /* A3 +=  W4*row[4] - W6*row[6] 
*/
         .endm
 
 /*
@@ -92,20 +92,20 @@
   Output in registers r4--r11
 */
         .macro idct_row4 shift
-        ldr    lr, =W46              /* lr =  W4 | (W6 << 16) */
-        ldr    r10,=W57              /* r10 = W5 | (W7 << 16) */
-        mov    r1, #(1<<(\shift-1))
-        smlad  r4, r2, ip, r1
-        smlsd  r7, r2, ip, r1
-        ldr    ip, =W13              /* ip =  W1 | (W3 << 16) */
-        smlad  r5, r2, lr, r1
-        smlsd  r6, r2, lr, r1
-        smusdx r11,r3, r10           /* r11 =  B3 = W7*row[1] - W5*row[3] */
-        smuad  r8, r3, ip            /* r8  =  B0 = W1*row[1] + W3*row[3] */
-        pkhtb  r2, ip, r10,asr #16   /* r3  =  W7 | (W3 << 16) */
-        pkhbt  r1, ip, r10,lsl #16   /* r1  =  W1 | (W5 << 16) */
-        smusdx r9, r2, r3            /* r9  = -B1 = W7*row[3] - W3*row[1] */
-        smusdx r10,r3, r1            /* r10 =  B2 = W5*row[1] - W1*row[3] */
+        ldr             lr, =W46              /* lr =  W4 | (W6 << 16) */
+        ldr             r10,=W57              /* r10 = W5 | (W7 << 16) */
+        mov             r1, #(1<<(\shift-1))
+        smlad           r4, r2, ip, r1
+        smlsd           r7, r2, ip, r1
+        ldr             ip, =W13              /* ip =  W1 | (W3 << 16) */
+        smlad           r5, r2, lr, r1
+        smlsd           r6, r2, lr, r1
+        smusdx          r11,r3, r10           /* r11 =  B3 = W7*row[1] - 
W5*row[3] */
+        smuad           r8, r3, ip            /* r8  =  B0 = W1*row[1] + 
W3*row[3] */
+        pkhtb           r2, ip, r10,asr #16   /* r3  =  W7 | (W3 << 16) */
+        pkhbt           r1, ip, r10,lsl #16   /* r1  =  W1 | (W5 << 16) */
+        smusdx          r9, r2, r3            /* r9  = -B1 = W7*row[3] - 
W3*row[1] */
+        smusdx          r10,r3, r1            /* r10 =  B2 = W5*row[1] - 
W1*row[3] */
         .endm
 
 /*
@@ -114,14 +114,14 @@
   Output in registers ip, r4--r6, lr, r8--r10
 */
         .macro idct_finish
-        add    ip, r4, r8            /* r1 = A0 + B0 */
-        sub    lr, r4, r8            /* r2 = A0 - B0 */
-        sub    r4, r5, r9            /* r2 = A1 + B1 */
-        add    r8, r5, r9            /* r2 = A1 - B1 */
-        add    r5, r6, r10           /* r1 = A2 + B2 */
-        sub    r9, r6, r10           /* r1 = A2 - B2 */
-        add    r6, r7, r11           /* r2 = A3 + B3 */
-        sub    r10,r7, r11           /* r2 = A3 - B3 */
+        add             ip, r4, r8            /* r1 = A0 + B0 */
+        sub             lr, r4, r8            /* r2 = A0 - B0 */
+        sub             r4, r5, r9            /* r2 = A1 + B1 */
+        add             r8, r5, r9            /* r2 = A1 - B1 */
+        add             r5, r6, r10           /* r1 = A2 + B2 */
+        sub             r9, r6, r10           /* r1 = A2 - B2 */
+        add             r6, r7, r11           /* r2 = A3 + B3 */
+        sub             r10,r7, r11           /* r2 = A3 - B3 */
         .endm
 
 /*
@@ -130,25 +130,25 @@
   Input/output in registers r4--r11
 */
         .macro idct_finish_shift shift
-        add    r3, r4, r8            /* r3 = A0 + B0 */
-        sub    r2, r4, r8            /* r2 = A0 - B0 */
-        mov    r4, r3, asr #\shift
-        mov    r8, r2, asr #\shift
-
-        sub    r3, r5, r9            /* r3 = A1 + B1 */
-        add    r2, r5, r9            /* r2 = A1 - B1 */
-        mov    r5, r3, asr #\shift
-        mov    r9, r2, asr #\shift
-
-        add    r3, r6, r10           /* r3 = A2 + B2 */
-        sub    r2, r6, r10           /* r2 = A2 - B2 */
-        mov    r6, r3, asr #\shift
-        mov    r10,r2, asr #\shift
-
-        add    r3, r7, r11           /* r3 = A3 + B3 */
-        sub    r2, r7, r11           /* r2 = A3 - B3 */
-        mov    r7, r3, asr #\shift
-        mov    r11,r2, asr #\shift
+        add             r3, r4, r8            /* r3 = A0 + B0 */
+        sub             r2, r4, r8            /* r2 = A0 - B0 */
+        mov             r4, r3, asr #\shift
+        mov             r8, r2, asr #\shift
+
+        sub             r3, r5, r9            /* r3 = A1 + B1 */
+        add             r2, r5, r9            /* r2 = A1 - B1 */
+        mov             r5, r3, asr #\shift
+        mov             r9, r2, asr #\shift
+
+        add             r3, r6, r10           /* r3 = A2 + B2 */
+        sub             r2, r6, r10           /* r2 = A2 - B2 */
+        mov             r6, r3, asr #\shift
+        mov             r10,r2, asr #\shift
+
+        add             r3, r7, r11           /* r3 = A3 + B3 */
+        sub             r2, r7, r11           /* r2 = A3 - B3 */
+        mov             r7, r3, asr #\shift
+        mov             r11,r2, asr #\shift
         .endm
 
 /*
@@ -157,25 +157,25 @@
   Input/output in registers r4--r11
 */
         .macro idct_finish_shift_sat shift
-        add    r3, r4, r8            /* r3 = A0 + B0 */
-        sub    ip, r4, r8            /* ip = A0 - B0 */
-        usat   r4, #8, r3, asr #\shift
-        usat   r8, #8, ip, asr #\shift
-
-        sub    r3, r5, r9            /* r3 = A1 + B1 */
-        add    ip, r5, r9            /* ip = A1 - B1 */
-        usat   r5, #8, r3, asr #\shift
-        usat   r9, #8, ip, asr #\shift
-
-        add    r3, r6, r10           /* r3 = A2 + B2 */
-        sub    ip, r6, r10           /* ip = A2 - B2 */
-        usat   r6, #8, r3, asr #\shift
-        usat   r10,#8, ip, asr #\shift
-
-        add    r3, r7, r11           /* r3 = A3 + B3 */
-        sub    ip, r7, r11           /* ip = A3 - B3 */
-        usat   r7, #8, r3, asr #\shift
-        usat   r11,#8, ip, asr #\shift
+        add             r3, r4, r8            /* r3 = A0 + B0 */
+        sub             ip, r4, r8            /* ip = A0 - B0 */
+        usat            r4, #8, r3, asr #\shift
+        usat            r8, #8, ip, asr #\shift
+
+        sub             r3, r5, r9            /* r3 = A1 + B1 */
+        add             ip, r5, r9            /* ip = A1 - B1 */
+        usat            r5, #8, r3, asr #\shift
+        usat            r9, #8, ip, asr #\shift
+
+        add             r3, r6, r10           /* r3 = A2 + B2 */
+        sub             ip, r6, r10           /* ip = A2 - B2 */
+        usat            r6, #8, r3, asr #\shift
+        usat            r10,#8, ip, asr #\shift
+
+        add             r3, r7, r11           /* r3 = A3 + B3 */
+        sub             ip, r7, r11           /* ip = A3 - B3 */
+        usat            r7, #8, r3, asr #\shift
+        usat            r11,#8, ip, asr #\shift
         .endm
 
 /*
@@ -184,51 +184,51 @@
   r1 = dest
 */
 function idct_row_armv6
-        push   {lr}
-
-        ldr    lr, [r0, #12]         /* lr = row[7,5] */
-        ldr    ip, [r0, #4]          /* ip = row[6,4] */
-        ldr    r3, [r0, #8]          /* r3 = row[3,1] */
-        ldr    r2, [r0]              /* r2 = row[2,0] */
-        orrs   lr, lr, ip
-        itt    eq
-        cmpeq  lr, r3
-        cmpeq  lr, r2, lsr #16
-        beq    1f
-        push   {r1}
-        ldr    ip, =W42              /* ip = W4 | (W2 << 16) */
-        cmp    lr, #0
-        beq    2f
-
-        idct_row   ROW_SHIFT
-        b      3f
-
-2:      idct_row4  ROW_SHIFT
-
-3:      pop    {r1}
+        push            {lr}
+
+        ldr             lr, [r0, #12]         /* lr = row[7,5] */
+        ldr             ip, [r0, #4]          /* ip = row[6,4] */
+        ldr             r3, [r0, #8]          /* r3 = row[3,1] */
+        ldr             r2, [r0]              /* r2 = row[2,0] */
+        orrs            lr, lr, ip
+        itt             eq
+        cmpeq           lr, r3
+        cmpeq           lr, r2, lsr #16
+        beq             1f
+        push            {r1}
+        ldr             ip, =W42              /* ip = W4 | (W2 << 16) */
+        cmp             lr, #0
+        beq             2f
+
+        idct_row        ROW_SHIFT
+        b               3f
+
+2:      idct_row4       ROW_SHIFT
+
+3:      pop             {r1}
         idct_finish_shift ROW_SHIFT
 
-        strh   r4, [r1]
-        strh   r5, [r1, #(16*2)]
-        strh   r6, [r1, #(16*4)]
-        strh   r7, [r1, #(16*6)]
-        strh   r11,[r1, #(16*1)]
-        strh   r10,[r1, #(16*3)]
-        strh   r9, [r1, #(16*5)]
-        strh   r8, [r1, #(16*7)]
-
-        pop    {pc}
-
-1:      mov    r2, r2, lsl #3
-        strh   r2, [r1]
-        strh   r2, [r1, #(16*2)]
-        strh   r2, [r1, #(16*4)]
-        strh   r2, [r1, #(16*6)]
-        strh   r2, [r1, #(16*1)]
-        strh   r2, [r1, #(16*3)]
-        strh   r2, [r1, #(16*5)]
-        strh   r2, [r1, #(16*7)]
-        pop    {pc}
+        strh            r4, [r1]
+        strh            r5, [r1, #(16*2)]
+        strh            r6, [r1, #(16*4)]
+        strh            r7, [r1, #(16*6)]
+        strh            r11,[r1, #(16*1)]
+        strh            r10,[r1, #(16*3)]
+        strh            r9, [r1, #(16*5)]
+        strh            r8, [r1, #(16*7)]
+
+        pop             {pc}
+
+1:      mov             r2, r2, lsl #3
+        strh            r2, [r1]
+        strh            r2, [r1, #(16*2)]
+        strh            r2, [r1, #(16*4)]
+        strh            r2, [r1, #(16*6)]
+        strh            r2, [r1, #(16*1)]
+        strh            r2, [r1, #(16*3)]
+        strh            r2, [r1, #(16*5)]
+        strh            r2, [r1, #(16*7)]
+        pop             {pc}
 endfunc
 
 /*
@@ -237,25 +237,25 @@ endfunc
   r1 = dest
 */
 function idct_col_armv6
-        push   {r1, lr}
+        push            {r1, lr}
 
-        ldr    r2, [r0]              /* r2 = row[2,0] */
-        ldr    ip, =W42              /* ip = W4 | (W2 << 16) */
-        ldr    r3, [r0, #8]          /* r3 = row[3,1] */
-        idct_row COL_SHIFT
-        pop    {r1}
+        ldr             r2, [r0]              /* r2 = row[2,0] */
+        ldr             ip, =W42              /* ip = W4 | (W2 << 16) */
+        ldr             r3, [r0, #8]          /* r3 = row[3,1] */
+        idct_row        COL_SHIFT
+        pop             {r1}
         idct_finish_shift COL_SHIFT
 
-        strh   r4, [r1]
-        strh   r5, [r1, #(16*1)]
-        strh   r6, [r1, #(16*2)]
-        strh   r7, [r1, #(16*3)]
-        strh   r11,[r1, #(16*4)]
-        strh   r10,[r1, #(16*5)]
-        strh   r9, [r1, #(16*6)]
-        strh   r8, [r1, #(16*7)]
+        strh            r4, [r1]
+        strh            r5, [r1, #(16*1)]
+        strh            r6, [r1, #(16*2)]
+        strh            r7, [r1, #(16*3)]
+        strh            r11,[r1, #(16*4)]
+        strh            r10,[r1, #(16*5)]
+        strh            r9, [r1, #(16*6)]
+        strh            r8, [r1, #(16*7)]
 
-        pop    {pc}
+        pop             {pc}
 endfunc
 
 /*
@@ -265,27 +265,27 @@ endfunc
   r2 = line size
 */
 function idct_col_put_armv6
-        push   {r1, r2, lr}
+        push            {r1, r2, lr}
 
-        ldr    r2, [r0]              /* r2 = row[2,0] */
-        ldr    ip, =W42              /* ip = W4 | (W2 << 16) */
-        ldr    r3, [r0, #8]          /* r3 = row[3,1] */
-        idct_row COL_SHIFT
-        pop    {r1, r2}
+        ldr             r2, [r0]              /* r2 = row[2,0] */
+        ldr             ip, =W42              /* ip = W4 | (W2 << 16) */
+        ldr             r3, [r0, #8]          /* r3 = row[3,1] */
+        idct_row        COL_SHIFT
+        pop             {r1, r2}
         idct_finish_shift_sat COL_SHIFT
 
-        strb_post r4, r1, r2
-        strb_post r5, r1, r2
-        strb_post r6, r1, r2
-        strb_post r7, r1, r2
-        strb_post r11,r1, r2
-        strb_post r10,r1, r2
-        strb_post r9, r1, r2
-        strb_post r8, r1, r2
+        strb_post       r4, r1, r2
+        strb_post       r5, r1, r2
+        strb_post       r6, r1, r2
+        strb_post       r7, r1, r2
+        strb_post       r11,r1, r2
+        strb_post       r10,r1, r2
+        strb_post       r9, r1, r2
+        strb_post       r8, r1, r2
 
-        sub    r1, r1, r2, lsl #3
+        sub             r1, r1, r2, lsl #3
 
-        pop    {pc}
+        pop             {pc}
 endfunc
 
 /*
@@ -295,52 +295,52 @@ endfunc
   r2 = line size
 */
 function idct_col_add_armv6
-        push   {r1, r2, lr}
+        push            {r1, r2, lr}
 
-        ldr    r2, [r0]              /* r2 = row[2,0] */
-        ldr    ip, =W42              /* ip = W4 | (W2 << 16) */
-        ldr    r3, [r0, #8]          /* r3 = row[3,1] */
-        idct_row COL_SHIFT
-        pop    {r1, r2}
+        ldr             r2, [r0]              /* r2 = row[2,0] */
+        ldr             ip, =W42              /* ip = W4 | (W2 << 16) */
+        ldr             r3, [r0, #8]          /* r3 = row[3,1] */
+        idct_row        COL_SHIFT
+        pop             {r1, r2}
         idct_finish
 
-        ldrb   r3, [r1]
-        ldrb   r7, [r1, r2]
-        ldrb   r11,[r1, r2, lsl #2]
-        add    ip, r3, ip, asr #COL_SHIFT
-        usat   ip, #8, ip
-        add    r4, r7, r4, asr #COL_SHIFT
-        strb_post ip, r1, r2
-        ldrb   ip, [r1, r2]
-        usat   r4, #8, r4
-        ldrb   r11,[r1, r2, lsl #2]
-        add    r5, ip, r5, asr #COL_SHIFT
-        usat   r5, #8, r5
-        strb_post r4, r1, r2
-        ldrb   r3, [r1, r2]
-        ldrb   ip, [r1, r2, lsl #2]
-        strb_post r5, r1, r2
-        ldrb   r7, [r1, r2]
-        ldrb   r4, [r1, r2, lsl #2]
-        add    r6, r3, r6, asr #COL_SHIFT
-        usat   r6, #8, r6
-        add    r10,r7, r10,asr #COL_SHIFT
-        usat   r10,#8, r10
-        add    r9, r11,r9, asr #COL_SHIFT
-        usat   r9, #8, r9
-        add    r8, ip, r8, asr #COL_SHIFT
-        usat   r8, #8, r8
-        add    lr, r4, lr, asr #COL_SHIFT
-        usat   lr, #8, lr
-        strb_post r6, r1, r2
-        strb_post r10,r1, r2
-        strb_post r9, r1, r2
-        strb_post r8, r1, r2
-        strb_post lr, r1, r2
-
-        sub    r1, r1, r2, lsl #3
-
-        pop    {pc}
+        ldrb            r3, [r1]
+        ldrb            r7, [r1, r2]
+        ldrb            r11,[r1, r2, lsl #2]
+        add             ip, r3, ip, asr #COL_SHIFT
+        usat            ip, #8, ip
+        add             r4, r7, r4, asr #COL_SHIFT
+        strb_post       ip, r1, r2
+        ldrb            ip, [r1, r2]
+        usat            r4, #8, r4
+        ldrb            r11,[r1, r2, lsl #2]
+        add             r5, ip, r5, asr #COL_SHIFT
+        usat            r5, #8, r5
+        strb_post       r4, r1, r2
+        ldrb            r3, [r1, r2]
+        ldrb            ip, [r1, r2, lsl #2]
+        strb_post       r5, r1, r2
+        ldrb            r7, [r1, r2]
+        ldrb            r4, [r1, r2, lsl #2]
+        add             r6, r3, r6, asr #COL_SHIFT
+        usat            r6, #8, r6
+        add             r10,r7, r10,asr #COL_SHIFT
+        usat            r10,#8, r10
+        add             r9, r11,r9, asr #COL_SHIFT
+        usat            r9, #8, r9
+        add             r8, ip, r8, asr #COL_SHIFT
+        usat            r8, #8, r8
+        add             lr, r4, lr, asr #COL_SHIFT
+        usat            lr, #8, lr
+        strb_post       r6, r1, r2
+        strb_post       r10,r1, r2
+        strb_post       r9, r1, r2
+        strb_post       r8, r1, r2
+        strb_post       lr, r1, r2
+
+        sub             r1, r1, r2, lsl #3
+
+        pop             {pc}
 endfunc
 
 /*
@@ -349,77 +349,77 @@ endfunc
   width = width of columns in bytes
 */
         .macro idct_rows func width
-        bl     \func
-        add    r0, r0, #(16*2)
-        add    r1, r1, #\width
-        bl     \func
-        add    r0, r0, #(16*2)
-        add    r1, r1, #\width
-        bl     \func
-        add    r0, r0, #(16*2)
-        add    r1, r1, #\width
-        bl     \func
-        sub    r0, r0, #(16*5)
-        add    r1, r1, #\width
-        bl     \func
-        add    r0, r0, #(16*2)
-        add    r1, r1, #\width
-        bl     \func
-        add    r0, r0, #(16*2)
-        add    r1, r1, #\width
-        bl     \func
-        add    r0, r0, #(16*2)
-        add    r1, r1, #\width
-        bl     \func
-
-        sub    r0, r0, #(16*7)
+        bl              \func
+        add             r0, r0, #(16*2)
+        add             r1, r1, #\width
+        bl              \func
+        add             r0, r0, #(16*2)
+        add             r1, r1, #\width
+        bl              \func
+        add             r0, r0, #(16*2)
+        add             r1, r1, #\width
+        bl              \func
+        sub             r0, r0, #(16*5)
+        add             r1, r1, #\width
+        bl              \func
+        add             r0, r0, #(16*2)
+        add             r1, r1, #\width
+        bl              \func
+        add             r0, r0, #(16*2)
+        add             r1, r1, #\width
+        bl              \func
+        add             r0, r0, #(16*2)
+        add             r1, r1, #\width
+        bl              \func
+
+        sub             r0, r0, #(16*7)
         .endm
 
 /* void ff_simple_idct_armv6(int16_t *data); */
 function ff_simple_idct_armv6, export=1
-        push   {r4-r11, lr}
-        sub    sp, sp, #128
+        push            {r4-r11, lr}
+        sub             sp, sp, #128
 
-        mov    r1, sp
-        idct_rows idct_row_armv6, 2
-        mov    r1, r0
-        mov    r0, sp
-        idct_rows idct_col_armv6, 2
+        mov             r1, sp
+        idct_rows       idct_row_armv6, 2
+        mov             r1, r0
+        mov             r0, sp
+        idct_rows       idct_col_armv6, 2
 
-        add    sp, sp, #128
-        pop    {r4-r11, pc}
+        add             sp, sp, #128
+        pop             {r4-r11, pc}
 endfunc
 
 /* ff_simple_idct_add_armv6(uint8_t *dest, ptrdiff_t line_size, int16_t 
*data); */
 function ff_simple_idct_add_armv6, export=1
-        push   {r0, r1, r4-r11, lr}
-        sub    sp, sp, #128
-
-        mov    r0, r2
-        mov    r1, sp
-        idct_rows idct_row_armv6, 2
-        mov    r0, sp
-        ldr    r1, [sp, #128]
-        ldr    r2, [sp, #(128+4)]
-        idct_rows idct_col_add_armv6, 1
-
-        add    sp, sp, #(128+8)
-        pop    {r4-r11, pc}
+        push            {r0, r1, r4-r11, lr}
+        sub             sp, sp, #128
+
+        mov             r0, r2
+        mov             r1, sp
+        idct_rows       idct_row_armv6, 2
+        mov             r0, sp
+        ldr             r1, [sp, #128]
+        ldr             r2, [sp, #(128+4)]
+        idct_rows       idct_col_add_armv6, 1
+
+        add             sp, sp, #(128+8)
+        pop             {r4-r11, pc}
 endfunc
 
 /* ff_simple_idct_put_armv6(uint8_t *dest, ptrdiff_t line_size, int16_t 
*data); */
 function ff_simple_idct_put_armv6, export=1
-        push   {r0, r1, r4-r11, lr}
-        sub    sp, sp, #128
-
-        mov    r0, r2
-        mov    r1, sp
-        idct_rows idct_row_armv6, 2
-        mov    r0, sp
-        ldr    r1, [sp, #128]
-        ldr    r2, [sp, #(128+4)]
-        idct_rows idct_col_put_armv6, 1
-
-        add    sp, sp, #(128+8)
-        pop    {r4-r11, pc}
+        push            {r0, r1, r4-r11, lr}
+        sub             sp, sp, #128
+
+        mov             r0, r2
+        mov             r1, sp
+        idct_rows       idct_row_armv6, 2
+        mov             r0, sp
+        ldr             r1, [sp, #128]
+        ldr             r2, [sp, #(128+4)]
+        idct_rows       idct_col_put_armv6, 1
+
+        add             sp, sp, #(128+8)
+        pop             {r4-r11, pc}
 endfunc

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to