diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 21:59:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 22:06:01 +0100 |
| commit | 7ac1e27f0f06d55414c2b12f4ad5a43925bdf2a0 (patch) | |
| tree | da542021dfba9ddfa47eddcfc13e802bccd999c9 /libavcodec/version.h | |
| parent | cbfc9046e1c7e295b74f252902ae6f255eef4e78 (diff) | |
| parent | d6096a67422534918405abb46dafbbac4608cbc3 (diff) | |
| download | ffmpeg-7ac1e27f0f06d55414c2b12f4ad5a43925bdf2a0.tar.gz | |
Merge commit 'd6096a67422534918405abb46dafbbac4608cbc3'
* commit 'd6096a67422534918405abb46dafbbac4608cbc3':
Remove all SH4 architecture optimizations
Conflicts:
libavcodec/sh4/dsputil_sh4.c
libavcodec/sh4/dsputil_sh4.h
libavcodec/sh4/idct_sh4.c
libavcodec/sh4/sh4.h
If someone wants to maintain these (or other) SH4 optimizations, please
contact me or ffmpeg-devel.
I am happy to revert this removial if theres someone considering to
maintain this code.
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 61a7968524..0143bd4f99 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -141,5 +141,8 @@ #ifndef FF_API_EMU_EDGE #define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_ARCH_SH4 +#define FF_API_ARCH_SH4 (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #endif /* AVCODEC_VERSION_H */ |