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/version.h | |
| parent | a7663ad9cf74bb0a25c07085e7a8f2b235d0c0cb (diff) | |
| parent | c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac (diff) | |
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/version.h')
| -rw-r--r-- | libavcodec/version.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index d378130a4e..3ce9ad4f08 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -114,5 +114,8 @@ #ifndef FF_API_CODEC_PKT #define FF_API_CODEC_PKT (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_ARCH_ALPHA +#define FF_API_ARCH_ALPHA (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #endif /* AVCODEC_VERSION_H */ |