diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2013-01-20 14:48:35 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2013-01-20 15:20:00 +0100 |
| commit | 68f18f03519ae550e25cf12661172641e9f0eaca (patch) | |
| tree | 62e360697d6cfc7686e69c943bd228f45e0fa01c /libavcodec/arm | |
| parent | 0b711ca3f3e5643bac9ddef775f2b16187b66835 (diff) | |
| download | ffmpeg-68f18f03519ae550e25cf12661172641e9f0eaca.tar.gz | |
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
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | 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 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 |