Merge commit '61985ad72c47bbb668f2d3923bf5c9df83e79323'

* commit '61985ad72c47bbb668f2d3923bf5c9df83e79323': arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · b39e895024
parent 2beb81522e 61985ad72c
commit b39e895024
1 changed files with 4 additions and 6 deletions
--- a/libavcodec/arm/hpeldsp_armv6.S
+++ b/libavcodec/arm/hpeldsp_armv6.S
@ -132,12 +132,11 @@ function ff_put_pixels8_y2_armv6, export=1
        uhadd8          r9,  r5,  r7
        eor             r11, r5,  r7
        and             r10, r10, r12
-        ldrc_pre        ne,  r4,  r1,  r2
+        ldr_pre         r4,  r1,  r2
        uadd8           r8,  r8,  r10
        and             r11, r11, r12
        uadd8           r9,  r9,  r11
-        it              ne
-        ldrne           r5,  [r1, #4]
+        ldr             r5,  [r1, #4]
        uhadd8          r10, r4,  r6
        eor             r6,  r4,  r6
        uhadd8          r11, r5,  r7
@ -194,10 +193,9 @@ function ff_put_pixels8_y2_no_rnd_armv6, export=1
 1:
        subs            r3,  r3,  #2
        uhadd8          r8,  r4,  r6
-        ldrc_pre        ne,  r4,  r1,  r2
+        ldr_pre         r4,  r1,  r2
        uhadd8          r9,  r5,  r7
-        it              ne
-        ldrne           r5,  [r1, #4]
+        ldr             r5,  [r1, #4]
        uhadd8          r12, r4,  r6
        ldrc_pre        ne,  r6,  r1,  r2
        uhadd8          r14, r5,  r7