[libav-commits] videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL

Janne Grunau git at libav.org
Sun Jan 20 15:20:09 CET 2013


Module: libav
Branch: master
Commit: 68f18f03519ae550e25cf12661172641e9f0eaca

Author:    Janne Grunau <janne-libav at jannau.net>
Committer: Janne Grunau <janne-libav at jannau.net>
Date:      Sun Jan 20 14:48:35 2013 +0100

videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL

libavutil/arm/asm.S sets '.arch' depending on HAVE_ARMV5TE so that
assembling armv5te code will always succeed even if the default -march
flag does not support it. HAVE_ARMV5TE_EXTERNAL tests assembling code
with the default arch.
Fixes the missing symbol ff_prefetch_arm with --cpu= not including
armv5te.

CC: libav-stable at libav.org

---

 libavcodec/arm/videodsp_armv5te.S |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/libavcodec/arm/videodsp_armv5te.S b/libavcodec/arm/videodsp_armv5te.S
index 96e92d5..120069d 100644
--- a/libavcodec/arm/videodsp_armv5te.S
+++ b/libavcodec/arm/videodsp_armv5te.S
@@ -22,7 +22,6 @@
 #include "config.h"
 #include "libavutil/arm/asm.S"
 
-#if HAVE_ARMV5TE_EXTERNAL
 function ff_prefetch_arm, export=1
         subs            r2,  r2,  #1
         pld             [r0]
@@ -30,4 +29,3 @@ function ff_prefetch_arm, export=1
         bne             ff_prefetch_arm
         bx              lr
 endfunc
-#endif



More information about the libav-commits mailing list