diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-03-09 15:21:15 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2012-03-12 22:46:56 +0100 |
| commit | 363bd1c62c1bcbac2dcb56f3dc47824f075888d2 (patch) | |
| tree | 0632378b2cb9e40d80586c5bf02d738d7ac82297 /libavutil | |
| parent | 33c5c3ad070bc1203e48c8af9c6272d71f1d8b4d (diff) | |
| download | ffmpeg-363bd1c62c1bcbac2dcb56f3dc47824f075888d2.tar.gz | |
remove iwmmxt optimizations
The were broken since August of 2010 without anyone noticing until
three weeks ago. Nobody cares about it anymore and hopefully Marvell
will support NEON like in the PXA978 from now on.
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/Makefile | 1 | ||||
| -rw-r--r-- | libavutil/arm/cpu.c | 25 | ||||
| -rw-r--r-- | libavutil/cpu.c | 5 | ||||
| -rw-r--r-- | libavutil/cpu.h | 2 |
4 files changed, 1 insertions, 32 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index 221d9ce9bd..f7c8a61bf8 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -72,7 +72,6 @@ OBJS = adler32.o \ tree.o \ utils.o \ -OBJS-$(ARCH_ARM) += arm/cpu.o OBJS-$(ARCH_PPC) += ppc/cpu.o OBJS-$(ARCH_X86) += x86/cpu.o diff --git a/libavutil/arm/cpu.c b/libavutil/arm/cpu.c deleted file mode 100644 index 835513ed84..0000000000 --- a/libavutil/arm/cpu.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * This file is part of Libav. - * - * Libav is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * Libav is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "libavutil/cpu.h" -#include "config.h" - -int ff_get_cpu_flags_arm(void) -{ - return HAVE_IWMMXT * AV_CPU_FLAG_IWMMXT; -} diff --git a/libavutil/cpu.c b/libavutil/cpu.c index c44075be29..6fc13adbca 100644 --- a/libavutil/cpu.c +++ b/libavutil/cpu.c @@ -28,7 +28,6 @@ int av_get_cpu_flags(void) if (checked) return flags; - if (ARCH_ARM) flags = ff_get_cpu_flags_arm(); if (ARCH_PPC) flags = ff_get_cpu_flags_ppc(); if (ARCH_X86) flags = ff_get_cpu_flags_x86(); @@ -53,9 +52,7 @@ static const struct { int flag; const char *name; } cpu_flag_tab[] = { -#if ARCH_ARM - { AV_CPU_FLAG_IWMMXT, "iwmmxt" }, -#elif ARCH_PPC +#if ARCH_PPC { AV_CPU_FLAG_ALTIVEC, "altivec" }, #elif ARCH_X86 { AV_CPU_FLAG_MMX, "mmx" }, diff --git a/libavutil/cpu.h b/libavutil/cpu.h index 361fe9866a..55ad7d17a9 100644 --- a/libavutil/cpu.h +++ b/libavutil/cpu.h @@ -40,7 +40,6 @@ #define AV_CPU_FLAG_AVX 0x4000 ///< AVX functions: requires OS support even if YMM registers aren't used #define AV_CPU_FLAG_XOP 0x0400 ///< Bulldozer XOP functions #define AV_CPU_FLAG_FMA4 0x0800 ///< Bulldozer FMA4 functions -#define AV_CPU_FLAG_IWMMXT 0x0100 ///< XScale IWMMXT #define AV_CPU_FLAG_ALTIVEC 0x0001 ///< standard /** @@ -57,7 +56,6 @@ int av_get_cpu_flags(void); void av_set_cpu_flags_mask(int mask); /* The following CPU-specific functions shall not be called directly. */ -int ff_get_cpu_flags_arm(void); int ff_get_cpu_flags_ppc(void); int ff_get_cpu_flags_x86(void); |