From 101f5a2c5db12605c24fe4aa41b3fabacfd3bad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Mon, 22 Jul 2013 12:33:22 +0300
Subject: [PATCH 49/49] [ffmpeg] - backport - arm: Mangle external symbols
 properly in new vfp assembly files

Reviewed-by: Kostya Shishkov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 lib/ffmpeg/libavcodec/arm/dcadsp_vfp.S       |    2 +-
 lib/ffmpeg/libavcodec/arm/mdct_vfp.S         |    4 ++--
 lib/ffmpeg/libavcodec/arm/synth_filter_vfp.S |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/ffmpeg/libavcodec/arm/dcadsp_vfp.S b/lib/ffmpeg/libavcodec/arm/dcadsp_vfp.S
index 6039e87..5892a84 100644
--- a/lib/ffmpeg/libavcodec/arm/dcadsp_vfp.S
+++ b/lib/ffmpeg/libavcodec/arm/dcadsp_vfp.S
@@ -463,7 +463,7 @@ NOVFP   ldr     a1, [fp, #-8*4]
 VFP     stmia   sp, {WINDOW, OUT, BUF}
 NOVFP   stmia   sp, {WINDOW, OUT, BUF, SCALEINT}
 VFP     vldr    SCALE, [sp, #3*4]
-        bl      ff_synth_filter_float_vfp
+        bl      X(ff_synth_filter_float_vfp)
         add     OUT, OUT, #32*4
         add     BUF, BUF, #32*4
         subs    COUNT, COUNT, #1
diff --git a/lib/ffmpeg/libavcodec/arm/mdct_vfp.S b/lib/ffmpeg/libavcodec/arm/mdct_vfp.S
index 0623e96..94db24f 100644
--- a/lib/ffmpeg/libavcodec/arm/mdct_vfp.S
+++ b/lib/ffmpeg/libavcodec/arm/mdct_vfp.S
@@ -151,7 +151,7 @@ function ff_imdct_half_vfp, export=1
         ldr     ip, [CONTEXT, #5*4]         @ mdct_bits
         teq     ip, #6
         it      ne
-        bne     ff_imdct_half_c             @ only case currently accelerated is the one used by DCA
+        bne     X(ff_imdct_half_c)          @ only case currently accelerated is the one used by DCA

  .set n, 1<<6
  .set n2, n/2
@@ -175,7 +175,7 @@ function ff_imdct_half_vfp, export=1

         fmxr    FPSCR, OLDFPSCR
         mov     a1, OUT
-        bl      ff_fft16_vfp
+        bl      X(ff_fft16_vfp)
         ldr     lr, =0x03030000             @ RunFast mode, short vectors of length 4, stride 1
         fmxr    FPSCR, lr

diff --git a/lib/ffmpeg/libavcodec/arm/synth_filter_vfp.S b/lib/ffmpeg/libavcodec/arm/synth_filter_vfp.S
index c219c41..e6e6408 100644
--- a/lib/ffmpeg/libavcodec/arm/synth_filter_vfp.S
+++ b/lib/ffmpeg/libavcodec/arm/synth_filter_vfp.S
@@ -132,7 +132,7 @@ function ff_synth_filter_float_vfp, export=1
         str     lr, [P_SB_OFF]            @ rotate offset, modulo buffer size, ready for next call
         ldr     a3, [sp, #(16+6+2)*4]     @ fetch in from stack, to pass to imdct_half
 VFP     vmov    s16, SCALE                @ imdct_half is free to corrupt s0, but it contains one of our arguments in hardfp case
-        bl      ff_imdct_half_vfp
+        bl      X(ff_imdct_half_vfp)
 VFP     vmov    SCALE, s16

         fmrx    OLDFPSCR, FPSCR
--
1.7.9.5
