Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / arm / ac3dsp_armv6.S

diff --git a/libavcodec/arm/ac3dsp_armv6.S b/libavcodec/arm/ac3dsp_armv6.S
index c6ce47a2f79a6a4a1616f15cc29cc37ab7c81189..615baf94e08eade2247a40c3f0345a76472af74b 100644 (file)
--- a/libavcodec/arm/ac3dsp_armv6.S
+++ b/libavcodec/arm/ac3dsp_armv6.S
@@ -42,9 +42,11 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1
         mov             r11, r10
         ldrb            r10, [r4], #1                   @ band_start_tab[band++]
         subs            r9,  r9,  r5                    @   - floor
+        it              lt
         movlt           r9,  #0
         cmp             r10, r3                         @   - end
         and             r9,  r9,  r8                    @   & 0x1fe0
+        ite             gt
         subgt           r8,  r3,  r11
         suble           r8,  r10, r11
         add             r9,  r9,  r5                    @   + floor => m
@@ -79,5 +81,5 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1
         ldr             r0,  [sp, #12]
         mov             r1,  #0
         mov             r2,  #256
-        b               memset
+        b               X(memset)
 endfunc