From 68f18f03519ae550e25cf12661172641e9f0eaca Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Sun, 20 Jan 2013 14:48:35 +0100 Subject: [PATCH] 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@libav.org --- 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 96e92d5a73..120069db03 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 -- 2.11.0