[FFmpeg-cvslog] videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
Janne Grunau
git at videolan.org
Tue Feb 5 16:27:13 CET 2013
ffmpeg | branch: release/1.1 | Janne Grunau <janne-libav at jannau.net> | Sun Jan 20 14:48:35 2013 +0100| [1a28948eb3e5aaab1ed5dba7a9bc93b486995954] | committer: Janne Grunau
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
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a28948eb3e5aaab1ed5dba7a9bc93b486995954
---
libavcodec/arm/videodsp_armv5te.S | 2 --
1 file changed, 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 ffmpeg-cvslog
mailing list