diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 02:39:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 02:55:42 +0100 |
| commit | e25ed2608c960302d6f4832a5435c9672d78e282 (patch) | |
| tree | c1a47f794e12416578691bc9d53c36db5e33d150 /libavcodec/dct-test.c | |
| parent | a7663ad9cf74bb0a25c07085e7a8f2b235d0c0cb (diff) | |
| parent | c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac (diff) | |
| download | ffmpeg-e25ed2608c960302d6f4832a5435c9672d78e282.tar.gz | |
Merge commit 'c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac'
* commit 'c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac':
Remove all Alpha architecture optimizations
Conflicts:
libavcodec/alpha/asm.h
libavcodec/alpha/dsputil_alpha.c
libavcodec/alpha/dsputil_alpha.h
libavcodec/alpha/dsputil_alpha_asm.S
libavcodec/alpha/hpeldsp_alpha.c
libavcodec/alpha/hpeldsp_alpha.h
libavcodec/alpha/hpeldsp_alpha_asm.S
libavcodec/alpha/motion_est_alpha.c
libavcodec/alpha/motion_est_mvi_asm.S
libavcodec/alpha/mpegvideo_alpha.c
libavcodec/alpha/regdef.h
libavcodec/alpha/simple_idct_alpha.c
We have a qemu based fate alpha client. And various failures
on alpha have previously pointed to issues in generic C code.
Thus IMHO it makes sense to keep alpha code as long as someone
is willing to do the little bit of maintaince it needs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dct-test.c')
| -rw-r--r-- | libavcodec/dct-test.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index f323366c5f..547ea02a21 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -61,8 +61,6 @@ void ff_simple_idct_armv5te(int16_t *data); void ff_simple_idct_armv6(int16_t *data); void ff_simple_idct_neon(int16_t *data); -void ff_simple_idct_axp(int16_t *data); - struct algo { const char *name; void (*func)(int16_t *block); @@ -156,10 +154,6 @@ static const struct algo idct_tab[] = { { "SIMPLE-NEON", ff_simple_idct_neon, PARTTRANS_PERM, AV_CPU_FLAG_NEON }, #endif -#if ARCH_ALPHA - { "SIMPLE-ALPHA", ff_simple_idct_axp, NO_PERM }, -#endif - { 0 } }; |