diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 22:32:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 22:32:40 +0200 |
| commit | 1df2f7b6a88ed871231a3a78319e997523d837a5 (patch) | |
| tree | 9245df75e4e9b9954c08bc26965691b21e00fabb | |
| parent | 013172ae9f1ab35b70732dcab6385743c5fed876 (diff) | |
| parent | eba2233b58c2c4b468c58287d6537b2f1188a8cd (diff) | |
| download | ffmpeg-1df2f7b6a88ed871231a3a78319e997523d837a5.tar.gz | |
Merge commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd'
* commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd':
build: Add define for SIMD extensions requiring 16-byte aligned buffers
Conflicts:
configure
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | libavcodec/internal.h | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -1582,6 +1582,7 @@ ARCH_FEATURES=" local_aligned_8 local_aligned_16 local_aligned_32 + simd_align_16 " BUILTIN_LIST=" @@ -1997,8 +1998,7 @@ aligned_stack_if_any="aarch64 ppc x86" fast_64bit_if_any="aarch64 alpha ia64 mips64 parisc64 ppc64 sparc64 x86_64" fast_clz_if_any="aarch64 alpha avr32 mips ppc x86" fast_unaligned_if_any="aarch64 ppc x86" - -need_memalign="altivec neon sse" +simd_align_16_if_any="altivec neon sse" # system capabilities @@ -5191,7 +5191,7 @@ enabled_all dxva2 dxva2api_cobj CoTaskMemFree && enable dxva2_lib ! enabled_any memalign posix_memalign aligned_malloc && - enabled_any $need_memalign && enable memalign_hack + enabled $simd_align_16 && enable memalign_hack # add_dep lib dep # -> enable ${lib}_deps_${dep} diff --git a/libavcodec/internal.h b/libavcodec/internal.h index e00aad9431..dcb2113f6f 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -37,7 +37,7 @@ #if HAVE_AVX # define STRIDE_ALIGN 32 -#elif HAVE_NEON || ARCH_PPC || HAVE_MMX +#elif HAVE_SIMD_ALIGN_16 # define STRIDE_ALIGN 16 #else # define STRIDE_ALIGN 8 |