bink: Check for out of bound writes when building tree

[ffmpeg] / libavcodec / arm / rdft_neon.S

diff --git a/libavcodec/arm/rdft_neon.S b/libavcodec/arm/rdft_neon.S
index 4f8f529ee99407e29fd237487ca7d7320e7b0627..fba275eb8c18c66de11682f414050e9b7aa1bc89 100644 (file)
--- a/libavcodec/arm/rdft_neon.S
+++ b/libavcodec/arm/rdft_neon.S
@@ -2,20 +2,20 @@
  * ARM NEON optimised RDFT
  * Copyright (c) 2009 Mans Rullgard <mans@mansr.com>
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -33,10 +33,10 @@ function ff_rdft_calc_neon, export=1
         lsls            r6,  r6,  #31
         bne             1f
         add             r0,  r4,  #20
-        bl              ff_fft_permute_neon
+        bl              X(ff_fft_permute_neon)
         add             r0,  r4,  #20
         mov             r1,  r5
-        bl              ff_fft_calc_neon
+        bl              X(ff_fft_calc_neon)
 1:
         ldr             r12, [r4, #0]           @ nbits
         mov             r2,  #1
@@ -137,15 +137,16 @@ function ff_rdft_calc_neon, export=1
         vst1.32         {d22},    [r5,:64]
 
         cmp             r6,  #0
+        it              eq
         popeq           {r4-r8,pc}
 
         vmul.f32        d22, d22, d18
         vst1.32         {d22},    [r5,:64]
         add             r0,  r4,  #20
         mov             r1,  r5
-        bl              ff_fft_permute_neon
+        bl              X(ff_fft_permute_neon)
         add             r0,  r4,  #20
         mov             r1,  r5
         pop             {r4-r8,lr}
-        b               ff_fft_calc_neon
+        b               X(ff_fft_calc_neon)
 endfunc